diff options
| author | Paolo Borelli <pborelli@gnome.org> | 2010-07-25 22:02:54 +0200 |
|---|---|---|
| committer | Paolo Borelli <pborelli@gnome.org> | 2010-07-25 22:02:54 +0200 |
| commit | 4e232eb83301372067273a392da982e3fd27cb1a (patch) | |
| tree | 4b286940787403c293cd15999496eeda9056c8c6 | |
| parent | da977f858d01c3176a1320adbd6f19752373b161 (diff) | |
| download | gnome-control-center-4e232eb83301372067273a392da982e3fd27cb1a.tar.gz | |
Fix details dialog
| -rw-r--r-- | panels/fonts/cc-fonts-panel.c | 7 | ||||
| -rw-r--r-- | panels/fonts/gnome-font-properties.ui | 707 |
2 files changed, 606 insertions, 108 deletions
diff --git a/panels/fonts/cc-fonts-panel.c b/panels/fonts/cc-fonts-panel.c index 6ba3d38b9..0d3dcfd4b 100644 --- a/panels/fonts/cc-fonts-panel.c +++ b/panels/fonts/cc-fonts-panel.c @@ -854,14 +854,15 @@ cb_show_details (GtkWidget *button, CcFontsPanel *panel) CcFontsPanelPrivate *priv = panel->priv; if (!priv->font_details) { + GtkWindow *window; GtkAdjustment *adjustment; GtkWidget *widget; EnumGroup *group; priv->font_details = (GtkWidget *) gtk_builder_get_object (priv->builder, "render_details"); - gtk_window_set_transient_for (GTK_WINDOW (priv->font_details), - GTK_WINDOW ((GtkWidget *) gtk_builder_get_object (priv->builder, "appearance_window"))); + window = gtk_widget_get_toplevel (button); + gtk_window_set_transient_for (GTK_WINDOW (priv->font_details), window); widget = (GtkWidget *) gtk_builder_get_object (priv->builder, "dpi_spinner"); @@ -1014,7 +1015,7 @@ static void cc_fonts_panel_init (CcFontsPanel *panel) { CcFontsPanelPrivate *priv; - gchar *objects[] = {"fonts_panel", "details_dialog", NULL}; + gchar *objects[] = {"fonts_panel", "render_details", NULL}; GObject *peditor; GtkWidget *widget; GError *error = NULL; diff --git a/panels/fonts/gnome-font-properties.ui b/panels/fonts/gnome-font-properties.ui index df8c2c4c1..0ca2ef7df 100644 --- a/panels/fonts/gnome-font-properties.ui +++ b/panels/fonts/gnome-font-properties.ui @@ -510,34 +510,99 @@ <action-widget response="-7">closebutton1</action-widget> </action-widgets> </object> - <object class="GtkDialog" id="details_dialog"> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">65535</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">65535</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment3"> + <property name="upper">65535</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment4"> + <property name="upper">65535</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkDialog" id="render_details"> <property name="border_width">5</property> - <property name="title" translatable="yes">HTTP Proxy Details</property> + <property name="title" translatable="yes">Font Rendering Details</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <property name="has_separator">False</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox2"> + <object class="GtkVBox" id="dialog-vbox6"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">2</property> <child> - <object class="GtkVBox" id="vbox3"> + <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> <property name="border_width">5</property> - <property name="spacing">6</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> <child> - <object class="GtkCheckButton" id="use_auth_checkbutton"> + <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="xalign">0</property> + <property name="xscale">0</property> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkHBox" id="hbox_resolution"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>_Use authentication</b></property> - <property name="use_markup">True</property> - <property name="use_underline">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="label" translatable="yes">R_esolution:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">dpi_spinner</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox20"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkSpinButton" id="dpi_spinner"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="climb_rate">1</property> + </object> + <packing> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="label" translatable="yes">dots per inch</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> </child> </object> @@ -548,12 +613,17 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox3"> + <object class="GtkVBox" id="vbox8"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="label19"> + <object class="GtkLabel" id="label8"> <property name="visible">True</property> - <property name="label"> </property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Smoothing</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -562,65 +632,528 @@ </packing> </child> <child> - <object class="GtkTable" id="auth_table"> + <object class="GtkAlignment" id="alignment20"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">U_sername:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">username_entry</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="GtkLabel" id="label16"> + <object class="GtkTable" id="table5"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Password:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">password_entry</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkVBox" id="vbox12"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkRadioButton" id="antialias_none_radio"> + <property name="label" translatable="yes">_None</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment6"> + <property name="visible">True</property> + <child> + <object class="GtkDrawingArea" id="antialias_none_sample"> + <property name="visible">True</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox13"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkRadioButton" id="antialias_grayscale_radio"> + <property name="label" translatable="yes">Gra_yscale</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">antialias_none_radio</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment7"> + <property name="visible">True</property> + <child> + <object class="GtkDrawingArea" id="antialias_grayscale_sample"> + <property name="visible">True</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox14"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkRadioButton" id="antialias_subpixel_radio"> + <property name="label" translatable="yes">Sub_pixel (LCDs)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">antialias_none_radio</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment8"> + <property name="visible">True</property> + <child> + <object class="GtkDrawingArea" id="antialias_subpixel_sample"> + <property name="visible">True</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox9"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes" comments="font hinting">Hinting</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment21"> + <property name="visible">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="GtkEntry" id="password_entry"> + <object class="GtkTable" id="table6"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkVBox" id="vbox15"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkRadioButton" id="hint_none_radio"> + <property name="label" translatable="yes">N_one</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment9"> + <property name="visible">True</property> + <child> + <object class="GtkDrawingArea" id="hint_none_sample"> + <property name="visible">True</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child> + <object class="GtkVBox" id="vbox16"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkRadioButton" id="hint_slight_radio"> + <property name="label" translatable="yes">_Slight</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">hint_none_radio</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment10"> + <property name="visible">True</property> + <child> + <object class="GtkDrawingArea" id="hint_slight_sample"> + <property name="visible">True</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox17"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkRadioButton" id="hint_medium_radio"> + <property name="label" translatable="yes">_Medium</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">hint_none_radio</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment11"> + <property name="visible">True</property> + <child> + <object class="GtkDrawingArea" id="hint_medium_sample"> + <property name="visible">True</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox18"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkRadioButton" id="hint_full_radio"> + <property name="label" translatable="yes">_Full</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">hint_none_radio</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment12"> + <property name="visible">True</property> + <child> + <object class="GtkDrawingArea" id="hint_full_sample"> + <property name="visible">True</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <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> + </packing> + </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox10"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Subpixel Order</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment22"> + <property name="visible">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> <child> - <object class="GtkEntry" id="username_entry"> + <object class="GtkTable" id="table7"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <child> + <object class="GtkRadioButton" id="subpixel_rgb_radio"> + <property name="label" translatable="yes" comments="pixel order red, green, blue">_RGB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="subpixel_rgb_image"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child> + <object class="GtkHBox" id="hbox_bgr"> + <property name="visible">True</property> + <child> + <object class="GtkRadioButton" id="subpixel_bgr_radio"> + <property name="label" translatable="yes" comments="pixel order blue, green, red">_BGR</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">subpixel_rgb_radio</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="subpixel_bgr_image"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox_rgb"> + <property name="visible">True</property> + <child> + <object class="GtkRadioButton" id="subpixel_vrgb_radio"> + <property name="label" translatable="yes" comments="vertical hinting, pixel order red, green, blue">_VRGB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">subpixel_rgb_radio</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="subpixel_vrgb_image"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox5"> + <property name="visible">True</property> + <child> + <object class="GtkRadioButton" id="subpixel_vbgr_radio"> + <property name="label" translatable="yes" comments="vertical hinting, pixel order blue, green, red">VB_GR</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">subpixel_rgb_radio</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="subpixel_vbgr_image"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <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> + </packing> + </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> </child> </object> <packing> @@ -629,7 +1162,7 @@ </child> </object> <packing> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> </object> @@ -638,31 +1171,16 @@ </packing> </child> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area2"> + <object class="GtkHButtonBox" id="dialog-action_area6"> <property name="visible">True</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="helpbutton2"> - <property name="label">gtk-help</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="closebutton2"> + <object class="GtkButton" id="button3"> <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="receives_default">False</property> + <property name="receives_default">True</property> <property name="use_stock">True</property> </object> <packing> @@ -681,28 +1199,7 @@ </object> </child> <action-widgets> - <action-widget response="-11">helpbutton2</action-widget> - <action-widget response="-7">closebutton2</action-widget> + <action-widget response="-7">button3</action-widget> </action-widgets> </object> - <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">65535</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustment2"> - <property name="upper">65535</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustment3"> - <property name="upper">65535</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="adjustment4"> - <property name="upper">65535</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> </interface> |