diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-07-12 14:09:33 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-07-12 14:09:33 +0200 |
| commit | eb26267fd5acaad3a8b89d72320267a93b4003aa (patch) | |
| tree | ccaf2591005cfd8915c69b8a29a455735f953b24 | |
| parent | 887fe652b77f76e4b404102df180480d4fc97f2b (diff) | |
| download | uca-eb26267fd5acaad3a8b89d72320267a93b4003aa.tar.gz uca-eb26267fd5acaad3a8b89d72320267a93b4003aa.tar.bz2 uca-eb26267fd5acaad3a8b89d72320267a93b4003aa.tar.xz uca-eb26267fd5acaad3a8b89d72320267a93b4003aa.zip | |
Remove scale widget
| -rw-r--r-- | test/control.c | 8 | ||||
| -rw-r--r-- | test/control.glade | 56 |
2 files changed, 5 insertions, 59 deletions
diff --git a/test/control.c b/test/control.c index 1e07eb5..96a476f 100644 --- a/test/control.c +++ b/test/control.c @@ -45,7 +45,6 @@ typedef struct { int width; int height; int pixel_size; - float scale; } ThreadData; typedef struct { @@ -143,12 +142,6 @@ void on_destroy(GtkWidget *widget, gpointer data) gtk_main_quit(); } -void on_adjustment_scale_value_changed(GtkAdjustment* adjustment, gpointer user_data) -{ - ThreadData *data = (ThreadData *) user_data; - data->scale = gtk_adjustment_get_value(adjustment); -} - static void on_toolbutton_run_clicked(GtkWidget *widget, gpointer args) { ThreadData *data = (ThreadData *) args; @@ -238,7 +231,6 @@ static void create_main_window(GtkBuilder *builder, const gchar* camera_name) td.buffer = (guchar *) g_malloc(td.pixel_size * td.width * td.height); td.pixels = gdk_pixbuf_get_pixels(pixbuf); td.running = FALSE; - td.scale = 65535.0f; td.statusbar = GTK_STATUSBAR(gtk_builder_get_object(builder, "statusbar")); td.statusbar_context_id = gtk_statusbar_get_context_id(td.statusbar, "Recording Information"); td.store = FALSE; diff --git a/test/control.glade b/test/control.glade index 5ead473..d7ba2fc 100644 --- a/test/control.glade +++ b/test/control.glade @@ -189,59 +189,13 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox2"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table1"> - <property name="visible">True</property> - <property name="n_columns">2</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">16-Bit Scale <i>1/x</i>:</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="x_options"></property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinbutton1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">adjustment_scale</property> - <property name="climb_rate">0.02</property> - <property name="digits">2</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">6</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> <packing> |