diff options
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/firstaidkit.glade | 36 | ||||
| -rw-r--r-- | frontend/frontend_gtk.py | 26 | ||||
| -rw-r--r-- | frontend/gtk-list.xml | 6 |
3 files changed, 62 insertions, 6 deletions
diff --git a/frontend/firstaidkit.glade b/frontend/firstaidkit.glade index 1d16cf6..869eba8 100644 --- a/frontend/firstaidkit.glade +++ b/frontend/firstaidkit.glade @@ -9,6 +9,8 @@ <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> + <property name="default_width">640</property> + <property name="default_height">480</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> <property name="decorated">True</property> @@ -65,11 +67,37 @@ </child> <child> - <widget class="GtkImageMenuItem" id="quit"> + <widget class="GtkImageMenuItem" id="expert_mode1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Expert mode</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_mainmenu_expert_activate" last_modification_time="Tue, 24 Aug 2010 13:57:18 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-properties</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkSeparatorMenuItem" id="separatormenuitem2"> + <property name="visible">True</property> + </widget> + </child> + + <child> + <widget class="GtkImageMenuItem" id="quit1"> <property name="visible">True</property> <property name="label">gtk-quit</property> <property name="use_stock">True</property> - <signal name="activate" handler="on_quit_activate"/> </widget> </child> </widget> @@ -118,6 +146,7 @@ <child> <widget class="GtkVBox" id="vbox3"> + <property name="border_width">3</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> @@ -297,8 +326,7 @@ </child> <child> - <widget class="GtkVBox" id="vbox4"> - <property name="visible">True</property> + <widget class="GtkVBox" id="expert_page"> <property name="homogeneous">False</property> <property name="spacing">0</property> diff --git a/frontend/frontend_gtk.py b/frontend/frontend_gtk.py index 86b6ed0..cbb113c 100644 --- a/frontend/frontend_gtk.py +++ b/frontend/frontend_gtk.py @@ -129,6 +129,11 @@ class CallbacksMainWindow(object): dir = os.path.dirname(self._glade.relative_file("."))) return True + def on_mainmenu_expert_activate(self, widget, *args): + self._glade.get_widget("expert_page").show() + self._data.pages.set_current_page(1) + return True + #advanced mode callbacks def on_b_StartAdvanced_activate(self, widget, *args): print("on_b_StartAdvanced_activate") @@ -317,10 +322,16 @@ class ListDialog(object): gtkb.add_from_file(os.path.join(dir, "gtk-list.xml")) self._dialog = gtkb.get_object("listdialog") self._dialog.set_title(title) - self._store = gtkb.get_object("store") + self._store = gtk.ListStore(gobject.TYPE_STRING, + gobject.TYPE_STRING, + gobject.TYPE_STRING, + gobject.TYPE_STRING, + gobject.TYPE_PYOBJECT, + gobject.TYPE_STRING) self._label = gtkb.get_object("label") self._label.set_text(description) self._view = gtkb.get_object("view") + self._view.set_model(self._store) rend_text = gtk.CellRendererText() rend_text_edit = gtk.CellRendererText() @@ -328,7 +339,11 @@ class ListDialog(object): rend_text_edit.connect('edited', self.edited_cb, self._store) col_0 = gtk.TreeViewColumn('Key', rend_text, text = 1) + col_0.set_resizable(True) + col_0.set_expand(False) col_1 = gtk.TreeViewColumn('Value', rend_text_edit, text = 2) + col_1.set_resizable(True) + col_1.set_expand(True) self._view.append_column(col_0) self._view.append_column(col_1) @@ -345,7 +360,14 @@ class ListDialog(object): return self._dialog.run() def edited_cb(self, cell, path, new_data, store): - store[path][2] = new_data + res = store[path][4].match(new_data) + if res is not None: + store[path][2] = new_data + else: + err = gtk.MessageDialog(type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK) + err.set_property("text", store[path][5]) + err.run() + err.destroy() def destroy(self): self._dialog.destroy() diff --git a/frontend/gtk-list.xml b/frontend/gtk-list.xml index bde40e6..427652f 100644 --- a/frontend/gtk-list.xml +++ b/frontend/gtk-list.xml @@ -12,10 +12,16 @@ <column type="gchararray"/> <!-- column-name tooltip --> <column type="gchararray"/> + <!-- column-name regexp --> + <column type="gpointer"/> + <!-- column-name validator_error --> + <column type="gchararray"/> </columns> </object> <object class="GtkDialog" id="listdialog"> <property name="border_width">5</property> + <property name="default_width">640</property> + <property name="default_height">480</property> <property name="type_hint">normal</property> <property name="has_separator">False</property> <signal name="close" handler="cb_close"/> |