diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-09-20 12:38:48 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-09-20 12:38:48 +0200 |
| commit | 1e0f5c0e7db5983ea4ceadc9ebb6992144eddc37 (patch) | |
| tree | 34bd46bb5d72e2b3c54a2ca6e01cc4a516fa9189 /bin/gui/control.glade | |
| parent | 57b722f74097da7709aec76afaa4ecb289e476d3 (diff) | |
| parent | 081bbb4d5959c4999993fd2e2ce9298b9dfaa12c (diff) | |
| download | uca-1e0f5c0e7db5983ea4ceadc9ebb6992144eddc37.tar.gz uca-1e0f5c0e7db5983ea4ceadc9ebb6992144eddc37.tar.bz2 uca-1e0f5c0e7db5983ea4ceadc9ebb6992144eddc37.tar.xz uca-1e0f5c0e7db5983ea4ceadc9ebb6992144eddc37.zip | |
Merge branch 'hiwi-changes' of https://github.com/MariaMatveeva/libuca into mm
Conflicts:
bin/gui/control.glade
Diffstat (limited to 'bin/gui/control.glade')
| -rw-r--r-- | bin/gui/control.glade | 82 |
1 files changed, 61 insertions, 21 deletions
diff --git a/bin/gui/control.glade b/bin/gui/control.glade index 442cb5e..7a339cf 100644 --- a/bin/gui/control.glade +++ b/bin/gui/control.glade @@ -6,6 +6,16 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> <object class="GtkListStore" id="camera-properties"> <columns> <!-- column-name PropertyName --> @@ -207,7 +217,7 @@ <property name="can_focus">False</property> <property name="title" translatable="yes">Camera Control</property> <property name="default_width">1024</property> - <property name="default_height">768</property> + <property name="default_height">767</property> <signal name="delete-event" handler="on_delete_event" swapped="no"/> <child> <object class="GtkVBox" id="vbox1"> @@ -389,6 +399,8 @@ <property name="height_request">480</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hadjustment">adjustment1</property> + <property name="vadjustment">adjustment2</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <child> @@ -407,8 +419,8 @@ </child> </object> <packing> - <property name="resize">True</property> - <property name="shrink">True</property> + <property name="resize">False</property> + <property name="shrink">False</property> </packing> </child> <child> @@ -972,40 +984,68 @@ <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label23"> + <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Zoom:</property> + <property name="border_width">12</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Zoom:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="zoom-box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">zoom-values</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </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">0</property> </packing> </child> <child> - <object class="GtkComboBox" id="zoom-box"> + <object class="GtkCheckButton" id="logarithmus-checkbutton"> + <property name="label" translatable="yes">Logarithmus</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">zoom-values</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="border_width">10</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> |