[gnome-panel/gnome-3-18] panel-properties-dialog: remove style option
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/gnome-3-18] panel-properties-dialog: remove style option
- Date: Tue, 19 Jan 2016 14:19:36 +0000 (UTC)
commit e3e775738bb6ab14e1b648b0c69d181faf98960b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed Dec 23 03:03:24 2015 +0200
panel-properties-dialog: remove style option
Remove style option from properties dialog. Transparency can be
set from GtkColorButton.
https://bugzilla.gnome.org/show_bug.cgi?id=759546
gnome-panel/panel-properties-dialog.c | 59 --------------
gnome-panel/panel-properties-dialog.ui | 137 ++++++--------------------------
2 files changed, 23 insertions(+), 173 deletions(-)
---
diff --git a/gnome-panel/panel-properties-dialog.c b/gnome-panel/panel-properties-dialog.c
index 396ff32..b9f475a 100644
--- a/gnome-panel/panel-properties-dialog.c
+++ b/gnome-panel/panel-properties-dialog.c
@@ -54,7 +54,6 @@ typedef struct {
GtkWidget *image_widgets;
GtkWidget *color_button;
GtkWidget *image_chooser;
- GtkWidget *opacity_scale;
GtkWidget *writability_warn_general;
GtkWidget *writability_warn_background;
@@ -423,9 +422,6 @@ panel_properties_dialog_background_color_update_from_rgba (PanelPropertiesDialog
GdkRGBA *color)
{
/* note: we might not be fully setup, so we have to do checks */
- if (dialog->opacity_scale)
- gtk_range_set_value (GTK_RANGE (dialog->opacity_scale),
- color->alpha * 100.);
if (dialog->color_button)
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog->color_button),
color);
@@ -497,60 +493,6 @@ panel_properties_dialog_color_button_setup (PanelPropertiesDialog *dialog,
gtk_widget_show (dialog->writability_warn_background);
}
-
-static void
-panel_properties_dialog_opacity_scale_changed (PanelPropertiesDialog *dialog)
-{
- gdouble percentage;
- GdkRGBA color;
-
- percentage = gtk_range_get_value (GTK_RANGE (dialog->opacity_scale));
-
- if (percentage >= 98)
- percentage = 100;
- else if (percentage <= 2)
- percentage = 0;
-
- panel_properties_dialog_background_color_get_rgba (dialog, &color);
- color.alpha = (percentage / 100.);
- panel_properties_dialog_background_color_set_from_rgba (dialog, &color);
-}
-
-static void
-panel_properties_dialog_opacity_scale_setup (PanelPropertiesDialog *dialog,
- GtkBuilder *gui)
-{
- GtkWidget *opacity_label;
- GtkWidget *opacity_legend;
-
- dialog->opacity_scale = PANEL_GTK_BUILDER_GET (gui, "opacity_scale");
- g_return_if_fail (dialog->opacity_scale != NULL);
- opacity_label = PANEL_GTK_BUILDER_GET (gui, "opacity_label");
- g_return_if_fail (opacity_label != NULL);
- opacity_legend = PANEL_GTK_BUILDER_GET (gui, "opacity_legend");
- g_return_if_fail (opacity_legend != NULL);
-
- panel_properties_dialog_background_color_update (dialog);
-
- g_signal_connect_swapped (dialog->opacity_scale, "value_changed",
- G_CALLBACK (panel_properties_dialog_opacity_scale_changed),
- dialog);
-
- g_settings_bind_writable (dialog->settings_background,
- PANEL_BACKGROUND_COLOR_KEY,
- opacity_label, "sensitive", FALSE);
- g_settings_bind_writable (dialog->settings_background,
- PANEL_BACKGROUND_COLOR_KEY,
- opacity_legend, "sensitive", FALSE);
- g_settings_bind_writable (dialog->settings_background,
- PANEL_BACKGROUND_COLOR_KEY,
- dialog->opacity_scale, "sensitive", FALSE);
-
- if (!g_settings_is_writable (dialog->settings_background,
- PANEL_BACKGROUND_COLOR_KEY))
- gtk_widget_show (dialog->writability_warn_background);
-}
-
/*******************\
* Background type *
\*******************/
@@ -764,7 +706,6 @@ panel_properties_dialog_new (PanelToplevel *toplevel,
panel_properties_dialog_image_chooser_setup (dialog, gui);
panel_properties_dialog_color_button_setup (dialog, gui);
- panel_properties_dialog_opacity_scale_setup (dialog, gui);
panel_properties_dialog_background_radios_setup (dialog, gui);
g_signal_connect (dialog->settings_background, "changed",
diff --git a/gnome-panel/panel-properties-dialog.ui b/gnome-panel/panel-properties-dialog.ui
index 7926ed7..3ac3fc5 100644
--- a/gnome-panel/panel-properties-dialog.ui
+++ b/gnome-panel/panel-properties-dialog.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.19.0 -->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.16"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="value">33.75</property>
@@ -160,10 +160,10 @@
<object class="GtkLabel" id="orientation_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Orientation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">orientation_combo</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -174,10 +174,10 @@
<object class="GtkLabel" id="size_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">size_spin</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -198,6 +198,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -213,6 +214,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -234,6 +236,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -265,6 +268,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -350,6 +354,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -370,6 +375,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<property name="group">default_radio</property>
</object>
@@ -394,7 +400,7 @@
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label"> </property>
</object>
<packing>
<property name="expand">False</property>
@@ -403,115 +409,13 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="table3">
+ <object class="GtkColorButton" id="color_button">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkColorButton" id="color_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="hexpand">True</property>
- <property name="title" translatable="yes">Pick a color</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="opacity_scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="draw_value">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="opacity_legend">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Transparent</property>
- <attributes>
- <attribute name="scale" value="0.82999999999999996"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label15">
- <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">Opaque</property>
- <attributes>
- <attribute name="scale" value="0.82999999999999996"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="color_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Co_lor:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">color_button</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="opacity_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">S_tyle:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">opacity_scale</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_alpha">True</property>
+ <property name="title" translatable="yes">Pick a color</property>
</object>
<packing>
<property name="expand">False</property>
@@ -539,6 +443,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<property name="group">default_radio</property>
</object>
@@ -556,7 +461,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label"> </property>
</object>
<packing>
<property name="expand">False</property>
@@ -681,6 +586,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -696,6 +602,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<property name="group">tile_radio</property>
</object>
@@ -712,6 +619,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<property name="group">tile_radio</property>
</object>
@@ -735,6 +643,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
