diff options
| author | Joseph Scheuhammer <clown@alum.mit.edu> | 2011-12-16 16:55:39 -0500 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2012-01-21 14:26:08 +0000 |
| commit | 9d5e654bec5697b115806201f1c9cf48e467244b (patch) | |
| tree | f364a9df2752e0fc262bcb37853a7a4955db74a0 /panels/universal-access/zoom-options.ui | |
| parent | 3ff082633ab893ad860d7aa491d1d0752ae63d2a (diff) | |
| download | gnome-control-center-9d5e654bec5697b115806201f1c9cf48e467244b.tar.gz | |
Universal access: add dialog for zoom options
Modified zoom options dialog to implement hbons wireframe.
https://bugzilla.gnome.org/show_bug.cgi?id=643086
Diffstat (limited to 'panels/universal-access/zoom-options.ui')
| -rw-r--r-- | panels/universal-access/zoom-options.ui | 917 |
1 files changed, 386 insertions, 531 deletions
diff --git a/panels/universal-access/zoom-options.ui b/panels/universal-access/zoom-options.ui index 51b50f0d2..9936637c6 100644 --- a/panels/universal-access/zoom-options.ui +++ b/panels/universal-access/zoom-options.ui @@ -17,13 +17,11 @@ <property name="page_increment">1</property> </object> <object class="GtkDialog" id="magPrefsDialog"> - <property name="width_request">650</property> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">Zoom Options</property> <property name="resizable">False</property> <property name="window_position">center-on-parent</property> - <property name="default_width">600</property> <property name="type_hint">normal</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -32,173 +30,96 @@ <property name="orientation">vertical</property> <property name="spacing">5</property> <child> - <object class="GtkNotebook" id="notebook1"> + <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <property name="margin-left">16</property> + <property name="margin-right">40</property> <child> - <object class="GtkVBox" id="vbox4"> + <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="frame2"> + <placeholder/> + </child> + <child type="label"> + <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="yscale">0</property> - <property name="left_padding">12</property> - <child> - <object class="GtkSpinButton" id="magFactorSpinButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="invisible_char">●</property> - <property name="adjustment">magFactor</property> - <property name="digits">2</property> - <accessibility> - <relation type="labelled-by" target="mag_factor_label"/> - </accessibility> - </object> - </child> - </object> - </child> - <child type="label"> <object class="GtkLabel" id="mag_factor_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="ypad">2</property> - <property name="label" translatable="yes">Magnification</property> + <property name="label" translatable="yes">Magnification:</property> <attributes> <attribute name="weight" value="bold"/> <attribute name="scale" value="1.25"/> </attributes> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">in</property> <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="yscale">0</property> - <property name="left_padding">12</property> - <child> - <object class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkRadioButton" id="proportional"> - <property name="label" translatable="yes">Always</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="relief">none</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">8</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="push"> - <property name="label" translatable="yes">To keep the pointer visible</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">proportional</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">8</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="centered"> - <property name="label" translatable="yes">To keep the pointer centered</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">proportional</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">8</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label1"> + <object class="GtkSpinButton" id="magFactorSpinButton"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xpad">1</property> - <property name="label" translatable="yes">Image moves with the mouse pointer</property> - <attributes> - <attribute name="weight" value="bold"/> - <attribute name="scale" value="1.25"/> - </attributes> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">magFactor</property> + <property name="digits">2</property> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">21</property> + <property name="position">1</property> + </packing> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">8</property> - <property name="position">1</property> - </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">4</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="frame4"> + <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">in</property> + <property name="top_padding">6</property> + <property name="left_padding">24</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">4</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> <child> - <object class="GtkRadioButton" id="full-screen"> - <property name="label" translatable="yes">Full Screen</property> + <object class="GtkRadioButton" id="moveableLens"> + <property name="label" translatable="yes">Follow mouse cursor</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -208,267 +129,231 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkRadioButton" id="top-half"> - <property name="label" translatable="yes">Top Half</property> + <object class="GtkRadioButton" id="screenPart"> + <property name="label" translatable="yes">Screen part:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_action_appearance">False</property> <property name="xalign">0</property> + <property name="yalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <property name="group">full-screen</property> + <property name="group">moveableLens</property> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">1</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkRadioButton" id="bottom-half"> - <property name="label" translatable="yes">Bottom Half</property> + <object class="GtkComboBox" id="screen_position_combo_box"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">full-screen</property> + <property name="can_focus">False</property> + <property name="model">screen_position_model</property> + <property name="active">0</property> + <child> + <object class="GtkCellRendererText" id="screen_position_renderer"/> + <attributes> + <attribute name="scale">1</attribute> + <attribute name="text">0</attribute> + </attributes> + </child> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="top_attach">1</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkRadioButton" id="left-half"> - <property name="label" translatable="yes">Left Half</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">full-screen</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> + <placeholder/> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">18</property> <child> - <object class="GtkRadioButton" id="right-half"> - <property name="label" translatable="yes">Right Half</property> + <object class="GtkBox" id="box4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">full-screen</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkCheckButton" id="scrollAtEdges"> + <property name="label" translatable="yes">Magnifier extends outside of screen</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">2</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="centered"> + <property name="label" translatable="yes">Keep magnifier cursor centered</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="push"> + <property name="label" translatable="yes">Magnifier cursor pushes contents around</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">centered</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="proportional"> + <property name="label" translatable="yes">Magnifier cursor moves with contents</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">centered</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Position of magnified view on screen</property> - <property name="use_markup">True</property> - <attributes> - <attribute name="weight" value="bold"/> - <attribute name="scale" value="1.25"/> - </attributes> - </object> - </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="moveableLensCheckbox"> - <property name="label" translatable="yes">Moveable lens - magnified view follows mouse movements</property> + <child type="label"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">8</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="scrollAtEdges"> - <property name="label" translatable="yes">Image scrolls at screen edges</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Magnifier Position:</property> + <attributes> + <attribute name="weight" value="bold"/> + <attribute name="scale" value="1.25"/> + </attributes> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">8</property> - <property name="position">5</property> - </packing> </child> </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">General</property> - </object> <packing> - <property name="tab_fill">False</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">4</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox8"> + <object class="GtkFrame" id="frame3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkFrame" id="frame3"> + <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="top_padding">8</property> + <property name="left_padding">16</property> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <placeholder/> + </child> <child> - <object class="GtkBox" id="box1"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="row_spacing">16</property> <child> - <object class="GtkHBox" id="xhairs_enabled_box"> + <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkSwitch" id="xhairsEnabledSwitch"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <accessibility> - <relation target="xhairs-section-heading" type="labelled-by"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="xHairsClipCheckbox"> - <property name="label" translatable="yes">Show crosshairs intersection</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes">Thickness:</property> + <property name="justify">center</property> + <property name="width_chars">12</property> + <attributes> + <attribute name="scale" value="1.25"/> + </attributes> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">8</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox3"> + <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="spacing">3</property> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel" id="xhairs_thickness_thin_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Color and Opacity</property> - <accessibility> - <relation type="label-for" target="xHairsPicker"/> - </accessibility> + <property name="xalign">1</property> + <property name="label" translatable="yes" comments="short delay">Thin</property> + <property name="justify">center</property> <attributes> - <attribute name="weight" value="bold"/> <attribute name="scale" value="1.25"/> </attributes> </object> @@ -479,108 +364,79 @@ </packing> </child> <child> - <object class="GtkColorButton" id="xHairsPicker"> + <object class="GtkHScale" id="xHairsThicknessSlider"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - <property name="yalign">0</property> - <property name="use_alpha">True</property> - <property name="color">#ffff00000000</property> + <property name="adjustment">xHairsThickness</property> + <property name="draw_value">False</property> + <property name="value_pos">right</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">8</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label7"> + <object class="GtkLabel" id="xhairs_thickness_thick_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Length</property> - <accessibility> - <relation type="label-for" target="xHairsLengthSlider"/> - </accessibility> + <property name="label" translatable="yes" comments="long delay">Thick</property> + <property name="justify">center</property> <attributes> - <attribute name="weight" value="bold"/> <attribute name="scale" value="1.25"/> </attributes> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="padding">8</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Length:</property> + <property name="justify">center</property> + <property name="width_chars">12</property> + <accessibility> + <relation type="label-for" target="xHairsLengthSlider"/> + </accessibility> + <attributes> + <attribute name="scale" value="1.25"/> + </attributes> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">3</property> <child> - <object class="GtkHBox" id="hbox6"> + <object class="GtkHScale" id="xHairsLengthSlider"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="xhairs_length_short_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label" translatable="yes" comments="short delay">Short</property> - <property name="justify">center</property> - <attributes> - <attribute name="scale" value="0.82999999999999996"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHScale" id="xHairsLengthSlider"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">xhairsLength</property> - <property name="draw_value">False</property> - <property name="value_pos">right</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="xhairs_length_long_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes" comments="long delay">Long</property> - <property name="justify">center</property> - <attributes> - <attribute name="scale" value="0.82999999999999996"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">8</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="adjustment">xhairsLength</property> + <property name="draw_value">False</property> + <property name="value_pos">right</property> </object> <packing> <property name="expand">True</property> @@ -590,140 +446,159 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">8</property> - <property name="position">3</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Color:</property> + <attributes> + <attribute name="scale" value="1.25"/> + </attributes> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">3</property> <child> - <object class="GtkLabel" id="label9"> + <object class="GtkColorButton" id="xHairsPicker"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Thickness</property> - <attributes> - <attribute name="weight" value="bold"/> - <attribute name="scale" value="1.25"/> - </attributes> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="yalign">0</property> + <property name="use_alpha">True</property> + <property name="color">#ffff00000000</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="hbox7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="xhairs_thickness_thin_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="label" translatable="yes" comments="short delay">Thin</property> - <property name="justify">center</property> - <attributes> - <attribute name="scale" value="0.82999999999999996"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHScale" id="xHairsThicknessSlider"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">xHairsThickness</property> - <property name="draw_value">False</property> - <property name="value_pos">right</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="xhairs_thickness_thick_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes" comments="long delay">Thick</property> - <property name="justify">center</property> - <attributes> - <attribute name="scale" value="0.82999999999999996"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">8</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">8</property> - <property name="position">4</property> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> - <child type="label"> + </object> + </child> + <child type="label"> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> <object class="GtkLabel" id="xhairs-section-heading"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Show</property> + <property name="label" translatable="yes">Crosshairs:</property> <property name="use_markup">True</property> <attributes> <attribute name="weight" value="bold"/> <attribute name="scale" value="1.25"/> </attributes> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkSwitch" id="xhairsEnabledSwitch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <accessibility> + <relation target="xhairs-section-heading" type="labelled-by"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="xHairsClipCheckbox"> + <property name="label" translatable="yes">Overlaps mouse cursor</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="margin-left">100</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> </object> <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Crosshairs</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">4</property> + <property name="position">2</property> </packing> </child> </object> @@ -771,53 +646,40 @@ <action-widget response="0">closeButton</action-widget> </action-widgets> </object> - <object class="GtkListStore" id="mouseTrackingList"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">None</col> - </row> - <row> - <col id="0" translatable="yes">Centered</col> - </row> - <row> - <col id="0" translatable="yes">Push</col> - </row> - <row> - <col id="0" translatable="yes">Proportional</col> - </row> - </data> - </object> - <object class="GtkListStore" id="screenPositionList"> + <object class="GtkListStore" id="screen_position_model"> <columns> <!-- column-name positions --> <column type="gchararray"/> - <!-- column-name scale --> - <column type="gdouble"/> + <!-- column-name text_scale --> + <column type="gfloat"/> + <!-- column-name setting_value --> + <column type="gchararray"/> </columns> <data> <row> <col id="0" translatable="yes">Full Screen</col> <col id="1">1.25</col> + <col id="2">full-screen</col> </row> <row> <col id="0" translatable="yes">Top Half</col> <col id="1">1.25</col> + <col id="2">top-half</col> </row> <row> <col id="0" translatable="yes">Bottom Half</col> <col id="1">1.25</col> + <col id="2">bottom-half</col> </row> <row> <col id="0" translatable="yes">Left Half</col> <col id="1">1.25</col> + <col id="2">left-half</col> </row> <row> <col id="0" translatable="yes">Right Half</col> <col id="1">1.25</col> + <col id="2">right-half</col> </row> </data> </object> @@ -835,11 +697,4 @@ <property name="step_increment">1</property> <property name="page_increment">100</property> </object> - <object class="GtkAdjustment" id="xhairsOpacity"> - <property name="lower">0.10000000000000001</property> - <property name="upper">1</property> - <property name="value">0.66000000000000003</property> - <property name="step_increment">0.01</property> - <property name="page_increment">0.10000000000000001</property> - </object> </interface> |