Commit fb5af3b7 authored by David Llewellyn-Jones's avatar David Llewellyn-Jones

UI fixes when creating new functions, such as including a suggested name.

parent fe7d7da0
......@@ -3,10 +3,10 @@
<!-- interface-requires gtk+ 2.24 -->
<!-- interface-naming-policy project-wide -->
<widget class="GtkWindow" id="MainWindow">
<property name="width_request">1000</property>
<property name="height_request">800</property>
<property name="can_focus">False</property>
<signal name="delete_event" handler="gtk_main_quit" swapped="no"/>
<property name="default_width">1024</property>
<property name="default_height">800</property>
<signal name="delete_event" handler="gtk_main_quit"/>
<child>
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
......@@ -1178,8 +1178,6 @@
<property name="position_set">True</property>
<child>
<widget class="GtkDrawingArea" id="DrawingArea">
<property name="width_request">600</property>
<property name="height_request">400</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK | GDK_VISIBILITY_NOTIFY_MASK</property>
......@@ -1194,11 +1192,18 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<widget class="GtkTreeView" id="FunctionList">
<widget class="GtkScrolledWindow" id="scrolledwindow17">
<property name="width_request">180</property>
<property name="height_request">180</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child>
<widget class="GtkTreeView" id="FunctionList">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
......@@ -1282,6 +1287,8 @@
<widget class="GtkNotebook" id="FunctionNotebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tab_pos">left</property>
<property name="scrollable">True</property>
<child>
<widget class="GtkTable" id="TabContentsFunction">
<property name="visible">True</property>
......@@ -1296,7 +1303,8 @@
<property name="label" translatable="yes">Function</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="x_options">GTK_SHRINK | GTK_FILL</property>
<property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
<property name="x_padding">4</property>
</packing>
</child>
......@@ -1310,8 +1318,8 @@
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="x_options">GTK_SHRINK | GTK_FILL</property>
<property name="y_options">GTK_SHRINK | GTK_FILL</property>
<property name="x_padding">4</property>
</packing>
</child>
......@@ -1334,7 +1342,8 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options">GTK_FILL</property>
<property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
<property name="y_options">GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
<child>
......@@ -1354,6 +1363,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
<property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
</widget>
......@@ -2173,7 +2184,7 @@
</packing>
</child>
<child>
<widget class="GtkButton" id="button3">
<widget class="GtkButton" id="PlotCancel">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
......
This diff is collapsed.
......@@ -2384,6 +2384,14 @@ GSList * GetFunctionList (VisPersist * psVisData) {
return psVisData->psFuncList;
}
unsigned int GetFunctionCount (VisPersist * psVisData) {
unsigned int uCount;
uCount = g_slist_length (psVisData->psFuncList);
return uCount;
}
void GetVisRange (double * afRange, VisPersist * psVisData) {
if (afRange) {
afRange[0] = psVisData->fXMin;
......
......@@ -95,6 +95,7 @@ void RenderCursor (float fX, float fY, void * pFont, char const * szString, int
int BitmapStringWidth (void * pFont, char const * szString);
void PlotFunction (char const * const szFunction, int nFunctionNum, VisPersist * psVisData);
GSList * GetFunctionList (VisPersist * psVisData);
unsigned int GetFunctionCount (VisPersist * psVisData);
FuncPersist * AddNewFunction (FUNCTYPE eType, VisPersist * psVisData);
void DeleteFunction (FuncPersist * psFuncData, VisPersist * psVisData);
void TransferFunctionRange (FuncPersist * psFuncData, VisPersist * psVisData);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment