From c6d2ea795a0b1fdc1c97ab8b56076ea019ce3df5 Mon Sep 17 00:00:00 2001 From: gryf Date: Mon, 7 Apr 2008 11:02:36 +0000 Subject: [PATCH] * Change of concept in extension handling. * Moved tags cloud into another tab. --- resources/glade/config.glade | 414 ++++++++++++++++++++++++++++++----- resources/glade/main.glade | 97 +++++--- src/ctrls/c_config.py | 4 +- src/ctrls/c_main.py | 21 +- src/views/v_dialogs.py | 2 - 5 files changed, 429 insertions(+), 109 deletions(-) diff --git a/resources/glade/config.glade b/resources/glade/config.glade index 506f255..50ece8f 100644 --- a/resources/glade/config.glade +++ b/resources/glade/config.glade @@ -89,57 +89,16 @@ 3 3 - + True 0 - Mount point: - mnt_entry + Eject program: + ejt_entry - - - - - - - 100 - True - True - - - 1 - 2 - - - - - - True - True - Browse... - True - 0 - - - - - 2 - 3 - - - - - - - 100 - True - True - - - 1 - 2 1 2 + @@ -163,15 +122,56 @@ - + + 100 True - 0 - Eject program: - ejt_entry + True + 1 + 2 1 2 + + + + + + True + True + Browse... + True + 0 + + + + + 2 + 3 + + + + + + + 100 + True + True + + + 1 + 2 + + + + + + True + 0 + Mount point: + mnt_entry + + @@ -553,6 +553,17 @@ Movies extesions 1 2 3 + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + + True @@ -565,17 +576,6 @@ Movies extesions GTK_FILL - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - 2 - - False @@ -661,6 +661,300 @@ Movies extesions 3 + + + 1 + + + True + 5 + 0 + + + True + True + 5 + 12 + + + True + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 + 2 + 3 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Command: + GTK_JUSTIFY_RIGHT + ext_entry + + + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + 2 + + + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + GTK_BUTTONBOX_END + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Add + 0 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Delete + 0 + + + 1 + + + + + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 3 + 2 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-go-forward + True + GTK_POS_TOP + 0 + + + False + False + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-go-back + True + 0 + + + False + False + 1 + + + + + 1 + 2 + 1 + 2 + GTK_SHRINK + GTK_SHRINK + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Command extensions + + + GTK_SHRINK + GTK_SHRINK + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Available extensions + + + 2 + 3 + GTK_SHRINK + GTK_SHRINK + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + 1 + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + 2 + 3 + 1 + 2 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Extension assignment</b> + True + + + label_item + + + + + 1 + + + + + 2 + + + + + + + + + True + <b>Comands</b> + True + + + label_item + + + + + + + 4 + + diff --git a/resources/glade/main.glade b/resources/glade/main.glade index 0ae8bd0..f09c6a3 100644 --- a/resources/glade/main.glade +++ b/resources/glade/main.glade @@ -426,84 +426,127 @@ True True - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC - + True True + False + True + + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Directories + + + tab + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC + GTK_POLICY_NEVER + GTK_SHADOW_ETCHED_IN - - True + True - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False - GTK_WRAP_WORD False - - True + + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Tag cloud + Reset + 0 - label_item + False + False + 1 - True - True + False - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC - + True True - False - True - - - + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + GTK_WRAP_WORD + False - True - True + 1 + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Tags + + + tab + 1 + False + - True + False True diff --git a/src/ctrls/c_config.py b/src/ctrls/c_config.py index ef9d3d2..2b44fa2 100644 --- a/src/ctrls/c_config.py +++ b/src/ctrls/c_config.py @@ -32,8 +32,10 @@ class ConfigController(Controller): 'General':'general_group', 'Scan options':'scan_group', 'Files extensions':'ft_group', + 'Commands':'commands_group', } - category_order = ['General', 'Disk options', 'Scan options', 'Files extensions'] + category_order = ['General', 'Disk options', 'Scan options', + 'Files extensions', 'Commands'] def __init__(self, model): Controller.__init__(self, model) diff --git a/src/ctrls/c_main.py b/src/ctrls/c_main.py index 615136c..b170d9d 100644 --- a/src/ctrls/c_main.py +++ b/src/ctrls/c_main.py @@ -49,13 +49,13 @@ class MainController(Controller): widgets = ( "discs","files", 'save1','save_as1','cut1','copy1','paste1','delete1','add_cd','add_directory1', - 'tb_save','tb_addcd','tb_find','tag_cloud_ex','description', + 'tb_save','tb_addcd','tb_find','nb_dirs','description', ) widgets_all = ( "discs","files", 'file1','edit1','add_cd','add_directory1','help1', 'tb_save','tb_addcd','tb_find','tb_new','tb_open','tb_quit', - 'tag_cloud_ex','description', + 'nb_dirs','description', ) widgets_cancel = ('cancel','cancel1') @@ -113,7 +113,6 @@ class MainController(Controller): if self.model.filename != None: self.__activate_ui(self.model.filename) - self.view['vpaned2'].set_position(18) # generate recent menu self.__generate_recent_menu() @@ -142,17 +141,6 @@ class MainController(Controller): if w: w.set_cursor(None) - def on_tag_cloud_ex_activate(self, widget): - # TODO: change this fsckin amatourish positioning! - if widget.get_expanded(): - self.view['vpaned2'].set_position(18) - else: - - w = self.view['tag_cloud_textview'].get_window(gtk.TEXT_WINDOW_TEXT) - if w: - w.set_cursor(gtk.gdk.Cursor(gtk.gdk.HAND2)) - self.view['vpaned2'].set_position(200) - def on_main_destroy_event(self, window, event): self.__do_quit() return True @@ -596,11 +584,6 @@ class MainController(Controller): self.__activate_ui() - self.view['tag_cloud_ex'].set_sensitive(True) - rect = self.view['tag_cloud_ex'].allocation - if __debug__: - print "c_main.py: __new_db(): tag_cloud_ex widget \ - dimensions", rect.width, rect.height, rect.x, rect.y return def __setup_disc_treeview(self): diff --git a/src/views/v_dialogs.py b/src/views/v_dialogs.py index 046ff45..c5a0f96 100644 --- a/src/views/v_dialogs.py +++ b/src/views/v_dialogs.py @@ -100,7 +100,6 @@ class Err(object): class Abt(object): """Show simple about dialog""" - #{{{ def __init__(self, name=None, ver="", title="", authors=[],licence=""): self.dialog = gtk.AboutDialog() self.dialog.set_title(title) @@ -110,7 +109,6 @@ class Abt(object): self.dialog.set_authors(authors) self.dialog.connect('response', lambda dialog, response: self.dialog.destroy()) self.dialog.show() - #}}} class InputDiskLabel(object): """Sepcific dialog for quering user for a disc label"""