diff --git a/ChangeLog b/ChangeLog index 1f8953969..4995d8da6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-10-01 Alex Roitman + * src/plugins/BookReport.py (BookReportSelector.__init__): + Use underline for labels. + * src/plugins/book.glade: Rework the dialog's layout. + 2003-09-29 Alex Roitman * TODO: Update the list with the postponed todo items. * configure.in: Increment release number. diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py index 714cef80f..794e2cb23 100644 --- a/src/plugins/BookReport.py +++ b/src/plugins/BookReport.py @@ -601,10 +601,12 @@ class BookReportSelector: self.name_entry.set_text(_('New Book')) avail_label = self.xml.get_widget('avail_label') - avail_label.set_text("%s" % _("Available items")) + avail_label.set_text("%s" % _("_Available items")) avail_label.set_use_markup(gtk.TRUE) + avail_label.set_use_underline(gtk.TRUE) book_label = self.xml.get_widget('book_label') - book_label.set_text("%s" % _("Current book")) + book_label.set_text("%s" % _("Current _book")) + book_label.set_use_underline(gtk.TRUE) book_label.set_use_markup(gtk.TRUE) av_titles = [(_('Name'),0,150),(_('Type'),1,50)] diff --git a/src/plugins/book.glade b/src/plugins/book.glade index f3d35f98f..66bc8f419 100644 --- a/src/plugins/book.glade +++ b/src/plugins/book.glade @@ -5,7 +5,8 @@ - 860 + 600 + 700 True Book GTK_WINDOW_TOPLEVEL @@ -15,49 +16,28 @@ False - + True False 0 - + True - title - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 12 - - - 0 - False - False - - - - - - True - True + False 0 - + True False 0 - + True - Book _name: - True + title + False False GTK_JUSTIFY_LEFT False @@ -65,8 +45,7 @@ 0.5 0.5 12 - 0 - name_entry + 12 0 @@ -76,16 +55,332 @@ - + True - True - True - True - 0 - - True - * - False + False + 0 + + + + True + False + 0 + + + + True + Book _name: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 12 + 0 + name_entry + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 6 + True + True + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + Clear the book + True + True + GTK_RELIEF_NORMAL + + + + + True + gtk-clear + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Save current set of configured selections + True + True + GTK_RELIEF_NORMAL + + + + + True + gtk-save + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Open previously created book + True + True + GTK_RELIEF_NORMAL + + + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + Manage previously created books + True + True + GTK_RELIEF_NORMAL + + + + + True + gtk-index + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 6 + False + False + GTK_PACK_END + + + + + 0 + False + False + + + + + + True + 2 + 1 + False + 0 + 0 + + + + True + avail_label + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 12 + 6 + avail_tree + + + 0 + 1 + 0 + 1 + + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + 0 + 1 + 1 + 2 + 12 + 6 + fill + + + + + 6 + True + True + + + + + + True + 2 + 1 + False + 0 + 0 + + + + True + book_label + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 12 + 6 + book_tree + + + 0 + 1 + 0 + 1 + + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_ETCHED_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + 0 + 1 + 1 + 2 + 12 + 6 + fill + + 6 @@ -96,145 +391,141 @@ 0 - False + True True - - - - - 0 - False - False - - - - - - True - 2 - 3 - False - 0 - 0 - - - + True - book_label - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 12 - 6 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - avail_label - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 12 - 6 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - GTK_BUTTONBOX_SPREAD - 12 + False + 0 - + + + + + True - GTK_BUTTONBOX_START - 6 + False + 8 - + True Add an item to the book True True - gtk-add - True GTK_RELIEF_NORMAL + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + False + - + True Remove currently selected item from the book True True - gtk-remove - True GTK_RELIEF_NORMAL + + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + False + - + True Move current selection one step up in the book True True - gtk-go-up - True GTK_RELIEF_NORMAL + + + + True + gtk-go-up + 4 + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + False + - + True Move current selection one step down in the book True True - gtk-go-down - True GTK_RELIEF_NORMAL + + + + True + gtk-go-down + 4 + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + False + - + True Configure currently selected item True @@ -243,253 +534,42 @@ - + True + gtk-preferences + 4 0.5 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-preferences - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Se_tup - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - Clear the book - True - True - gtk-clear - True - GTK_RELIEF_NORMAL - - - - - - - True - Save current set of configured selections - True - True - gtk-save - True - GTK_RELIEF_NORMAL - - - - - - - True - Open previously created book - True - True - gtk-open - True - GTK_RELIEF_NORMAL - - - - - - - True - Manage previously created books - True - True - GTK_RELIEF_NORMAL - - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-index - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Edit books - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - + 0 + 0 + + 0 + False + False + + + 8 + False + False + GTK_PACK_END + - 1 - 2 - 1 - 2 - shrink - - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - - - - - 0 - 1 - 1 - 2 - 24 - expand|shrink|fill - fill - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_ETCHED_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - - - - - 2 - 3 - 1 - 2 - 24 - expand|shrink|fill - fill + 10 + False + False + GTK_PACK_END - 6 + 0 True True @@ -528,7 +608,7 @@ 0 - True + False True