gnome-specimen r189 - in trunk-from-bzr: . data specimen
- From: wbolster svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-specimen r189 - in trunk-from-bzr: . data specimen
- Date: Tue, 17 Jun 2008 18:44:39 +0000 (UTC)
Author: wbolster
Date: Tue Jun 17 18:44:38 2008
New Revision: 189
URL: http://svn.gnome.org/viewvc/gnome-specimen?rev=189&view=rev
Log:
Add preview label for current font selection
The currently selected font is previewed so that it does not
have to be added to the list of previews before the sample
is actually shown to the user. This involved moving some
parts of the interface, and adding two labels: one for the
currently selected font name, and one for the sample text in
the requested font and colors.
The glade files where editing using Glade 3, so there are
quite some (textual) changes there.
Modified:
trunk-from-bzr/ (props changed)
trunk-from-bzr/data/gnome-specimen.glade
trunk-from-bzr/specimen/specimenwindow.py
Modified: trunk-from-bzr/data/gnome-specimen.glade
==============================================================================
--- trunk-from-bzr/data/gnome-specimen.glade (original)
+++ trunk-from-bzr/data/gnome-specimen.glade Tue Jun 17 18:44:38 2008
@@ -1,541 +1,419 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="main-window">
- <property name="title" translatable="yes">Specimen Font Previewer</property>
- <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>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <signal name="key_press_event" handler="on_main_window_key_press_event"/>
- <signal name="destroy" handler="on_destroy_event"/>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkMenuBar" id="menubar1">
- <property name="visible">True</property>
- <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
- <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
- <child>
- <widget class="GtkMenuItem" id="file_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
-
- <child>
- <widget class="GtkMenu" id="file_item_menu">
-
- <child>
- <widget class="GtkImageMenuItem" id="quit_item">
- <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
- <signal name="activate" handler="on_quit_item_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="edit_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Edit</property>
- <property name="use_underline">True</property>
-
- <child>
- <widget class="GtkMenu" id="edit_item_menu">
-
- <child>
- <widget class="GtkImageMenuItem" id="copy_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Copy Font Name</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_copy_item_activate"/>
- <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image78">
- <property name="visible">True</property>
- <property name="stock">gtk-copy</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="GtkImageMenuItem" id="clear_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Clear _List</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_clear_item_activate"/>
- <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image79">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</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="GtkImageMenuItem" id="find_item">
- <property name="visible">True</property>
- <property name="stock_item">GNOMEUIINFO_MENU_FIND_ITEM</property>
- <signal name="activate" handler="on_find_item_activate"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="change_colors_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">C_hange Colors...</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_change_colors_item_activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image80">
- <property name="visible">True</property>
- <property name="stock">gtk-select-color</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>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="help_item">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_underline">True</property>
-
- <child>
- <widget class="GtkMenu" id="help_item_menu">
-
- <child>
- <widget class="GtkImageMenuItem" id="about_item">
- <property name="label" translatable="yes">_About</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_about_item_activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image81">
- <property name="visible">True</property>
- <property name="stock">gtk-about</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>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHPaned" id="hpaned">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
-
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="fonts-treeview-window">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="fonts-treeview">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="rules_hint">True</property>
- <property name="reorderable">False</property>
- <property name="enable_search">False</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- <signal name="key_press_event" handler="on_fonts_treeview_key_press_event" last_modification_time="Fri, 08 Jun 2007 16:18:29 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="find-controls">
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="find-label">
- <property name="label" translatable="yes">Find:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">3</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="find-entry">
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- <signal name="changed" handler="on_find_entry_changed"/>
- <signal name="activate" handler="on_find_entry_activated"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="find-close-button">
- <property name="tooltip" translatable="yes">Close find</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="cancel_find_cb"/>
-
- <child>
- <widget class="GtkImage" id="image1">
- <property name="stock">gtk-close</property>
- <property name="icon_size">4</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>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">False</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">3</property>
-
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">3</property>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Preview Text:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">preview-text-entry</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="preview-text-entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text"> </property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- <signal name="changed" handler="on_preview_text_changed"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="preview-size-spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">16 1 144 1 10 10</property>
- <signal name="value_changed" handler="on_preview_size_changed"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">pt</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="previews-treeview-window">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="previews-treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">False</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- <signal name="move_cursor" handler="on_previews_treeview_move_cursor"/>
- <signal name="key_release_event" handler="on_previews_treeview_key_release_event"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkButton" id="clear-button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-clear</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="focus_on_click">False</property>
- <signal name="clicked" handler="on_clear_button_clicked"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="remove-button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="focus_on_click">False</property>
- <signal name="clicked" handler="on_remove_button_clicked"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="add-button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <property name="focus_on_click">False</property>
- <signal name="clicked" handler="on_add_button_clicked"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">False</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
+ <widget class="GtkWindow" id="main-window">
+ <property name="title" translatable="yes">Specimen Font Previewer</property>
+ <property name="default_width">640</property>
+ <property name="default_height">480</property>
+ <signal name="key_press_event" handler="on_main_window_key_press_event"/>
+ <signal name="destroy" handler="on_destroy_event"/>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkMenuBar" id="menubar1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkMenuItem" id="file_item">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_File</property>
+ <property name="use_underline">True</property>
+ <child>
+ <widget class="GtkMenu" id="file_item_menu">
+ <child>
+ <widget class="GtkImageMenuItem" id="quit_item">
+ <property name="label" translatable="yes">gtk-quit</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_quit_item_activate"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="edit_item">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="use_underline">True</property>
+ <child>
+ <widget class="GtkMenu" id="edit_item_menu">
+ <child>
+ <widget class="GtkImageMenuItem" id="copy_item">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Copy Font Name</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_copy_item_activate"/>
+ <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image78">
+ <property name="visible">True</property>
+ <property name="stock">gtk-copy</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="clear_item">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Clear _List</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_clear_item_activate"/>
+ <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image79">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="find_item">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">gtk-find</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_find_item_activate"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="change_colors_item">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">C_hange Colors...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_change_colors_item_activate"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image80">
+ <property name="visible">True</property>
+ <property name="stock">gtk-select-color</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="help_item">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
+ <child>
+ <widget class="GtkMenu" id="help_item_menu">
+ <child>
+ <widget class="GtkImageMenuItem" id="about_item">
+ <property name="label" translatable="yes">_About</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_about_item_activate"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image81">
+ <property name="visible">True</property>
+ <property name="stock">gtk-about</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHPaned" id="hpaned">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <widget class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="fonts-treeview-window">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkTreeView" id="fonts-treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="headers_visible">False</property>
+ <property name="rules_hint">True</property>
+ <property name="enable_search">False</property>
+ <signal name="key_press_event" handler="on_fonts_treeview_key_press_event"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="find-controls">
+ <property name="spacing">3</property>
+ <child>
+ <widget class="GtkLabel" id="find-label">
+ <property name="label" translatable="yes">Find:</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="find-entry">
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="invisible_char">*</property>
+ <signal name="changed" handler="on_find_entry_changed"/>
+ <signal name="activate" handler="on_find_entry_activated"/>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="find-close-button">
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Close find</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="focus_on_click">False</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="cancel_find_cb"/>
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="stock">gtk-close</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="spacing">3</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="spacing">3</property>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Preview Text:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">preview-text-entry</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="preview-text-entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
+ <property name="text"> </property>
+ <signal name="changed" handler="on_preview_text_changed"/>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="preview-size-spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">3</property>
+ <property name="width_chars">3</property>
+ <property name="adjustment">16 1 144 1 10 10</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+ <signal name="value_changed" handler="on_preview_size_changed"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">3</property>
+ <property name="label" translatable="yes">pt</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="preview-font-name-label">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Monospace (preview)</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEventBox" id="eventbox1">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkLabel" id="preview-label">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="xpad">3</property>
+ <property name="ypad">3</property>
+ <property name="label">This label will show the current selection.</property>
+ <property name="justify">GTK_JUSTIFY_FILL</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkButton" id="clear-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-clear</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="use_stock">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_clear_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="remove-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="use_stock">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_remove_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="add-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="use_stock">True</property>
+ <property name="focus_on_click">False</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_add_button_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow" id="previews-treeview-window">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkTreeView" id="previews-treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="enable_search">False</property>
+ <signal name="move_cursor" handler="on_previews_treeview_move_cursor"/>
+ <signal name="key_release_event" handler="on_previews_treeview_key_release_event"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
</glade-interface>
Modified: trunk-from-bzr/specimen/specimenwindow.py
==============================================================================
--- trunk-from-bzr/specimen/specimenwindow.py (original)
+++ trunk-from-bzr/specimen/specimenwindow.py Tue Jun 17 18:44:38 2008
@@ -114,6 +114,9 @@
self.gconf_client.notify(self.gconf_path_preview_text)
self.gconf_client.notify(self.gconf_path_preview_size)
+ # schedule an update to make sure the initial view is correct
+ #self.update_previews()
+
# show the window, but hide the form controls
self.window.show_all()
self.find_controls.hide()
@@ -170,9 +173,10 @@
name_column.pack_start(cell_renderer, True)
name_column.add_attribute(cell_renderer, 'text', 0)
- # setup the treeselection
+ # setup the tree selection and callbacks
self.fonts_treeview_selection = self.fonts_treeview.get_selection()
self.fonts_treeview_selection.set_mode(gtk.SELECTION_SINGLE)
+ self.fonts_treeview_selection.connect('changed', self.update_preview_label)
self.fonts_treeview_selection.connect('changed', self.update_ui_sensitivity)
# setup interaction
@@ -188,6 +192,9 @@
# loading is done when the list of remaining families is empty
if len(self.families) == 0:
+ # If no selection was made in the mean time, we just select the
+ # first font in the list
+ self.fonts_treeview.get_selection().select_path((0,))
return False
howmany_at_once = 50
@@ -265,7 +272,7 @@
# regular string comparison.
return cmp(name1, name2)
-
+
# font finding
def start_find(self):
@@ -326,6 +333,8 @@
def initialize_previews_pane(self, glade_tree):
'Initializes the preview pane'
# preview widgets
+ self.preview_label = glade_tree.get_widget('preview-label')
+ self.preview_font_name_label = glade_tree.get_widget('preview-font-name-label')
self.preview_size_spinbutton = glade_tree.get_widget('preview-size-spinbutton')
self.preview_text_entry = glade_tree.get_widget('preview-text-entry')
self.previews_treeview = glade_tree.get_widget('previews-treeview')
@@ -345,7 +354,7 @@
self.previews_preview_column.pack_start(cell_renderer, True)
self.previews_preview_column.set_cell_data_func(cell_renderer, self.cell_data_cb)
- # setup the treeselection
+ # setup the tree selection and callbacks
self.previews_treeview_selection = self.previews_treeview.get_selection()
self.previews_treeview_selection.set_select_function(self._set_preview_row_selection)
self.previews_treeview_selection.connect('changed', self.update_ui_sensitivity)
@@ -416,7 +425,7 @@
model = self.fonts_treeview.get_model()
# If the path contains only one item, this is a parent row. Adjust the
- # path so that it points to the first child row.
+ # path so that it points to the first h(child row.
if len(path) == 1:
path = (path[0], 0)
@@ -450,6 +459,9 @@
def update_previews(self):
'Updates the previews'
+ # Change the preview label
+ self.update_preview_label()
+
# Redraw/resize the previews
self.previews_preview_column.queue_resize()
self.previews_treeview.queue_draw()
@@ -459,6 +471,52 @@
# Allow this method to be used as a single-run idle timeout
return False
+ def update_preview_label(self, *args):
+ # If there is a valid selection, we should preview it in the preview label
+ model, treeiter = self.fonts_treeview.get_selection().get_selected()
+
+ if model is None:
+ # May happen during updates
+ return False
+
+ if treeiter is None:
+ # This may happen during loading.
+ if model.iter_n_children(None) == 0:
+ # Font list is (still) empty, do nothing.
+ return False
+ else:
+ # Just select the first one in the list.
+ treeiter = model.get_iter((0,))
+
+ # Find out which font name is currently selection. If the selection is
+ # a top level row, we use the first style. If it's a child row, we use
+ # the selected style.
+ if model.iter_parent(treeiter) is None:
+ treeiter = model.iter_children(treeiter)
+
+ path = model.get_path(treeiter)
+ if len(path) == 1:
+ # This is a top level row, use the first child
+ path = (path[0], 0)
+
+ family, face = model.get(treeiter, 1, 2)
+
+ # Update the preview text and set the correct font and colors
+
+ self.preview_font_name_label.set_text(face.describe().to_string())
+ self.preview_label.set_text(self.preview_text)
+ font_description = face.describe()
+ attrs = pango.AttrList()
+ attrs.insert(pango.AttrFontDesc(font_description, 0, -1))
+ attrs.insert(pango.AttrSize(self.preview_size * pango.SCALE, 0, -1))
+ attrs.insert(pango.AttrForeground(
+ self.preview_fgcolor.red,
+ self.preview_fgcolor.green,
+ self.preview_fgcolor.blue,
+ 0, -1))
+ self.preview_label.set_attributes(attrs)
+ self.preview_label.get_parent().modify_bg(gtk.STATE_NORMAL, self.preview_bgcolor)
+
def clear_previews(self):
'Clears all previews'
self.previews_store.clear()
@@ -475,6 +533,10 @@
if (path >= 0):
self.previews_treeview.get_selection().select_path(path)
+ # Scroll to the bottom. FIXME: This doesn't work correctly.
+ adj = self.previews_treeview.get_vadjustment()
+ adj.value = adj.upper
+
def delete_selected(self):
model, treeiter = self.previews_treeview.get_selection().get_selected()
if treeiter is not None:
@@ -683,7 +745,7 @@
self.preview_size = size
self.preview_size_spinbutton.set_value(self.preview_size)
- self.update_previews()
+ self.schedule_update_previews()
# buttons
@@ -725,6 +787,9 @@
has_previews = (self.num_previews() > 0)
self.buttons['clear'].set_sensitive(has_previews)
+ # Allow the sginal to propagate further
+ return False
+
# menu item callbacks
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
