/ukui-control-center

Permalink
Browse files

Merge branch 'master' of github.com:ukui/ukui-control-center

  • Loading branch information...
2 parents 9ce2f8b + 93baf02 commit 6e7769e90fb6acbe69ed54f8e5a618a9c5b3199b @handsome-feng handsome-feng committed Mar 21, 2017
View
2 panels/keyboard/mate-keybinding-properties.c
@@ -18,7 +18,7 @@
#define GSETTINGS_KEYBINDINGS_DIR "/org/mate/desktop/keybindings/"
#define GSETTINGS_KEYBINDINGS_SYSTEM "/org/mate/marco/global-keybindings/"
-#define CUSTOM_KEYBINDING_SCHEMA "org.ukui.control-center.keybinding"
+#define CUSTOM_KEYBINDING_SCHEMA "org.mate.control-center.keybinding"
#define MARCO_KEY "org.mate.Marco.global-keybindings"
#define MAX_ELEMENTS_BEFORE_SCROLLING 10
View
7 panels/keyboard/mate-keyboard-properties.c
@@ -160,7 +160,12 @@ setup_dialog (GtkBuilder * builder)
void add_keyboard_app(GtkBuilder *builder)
{
g_warning("add_keyboard_app");
- activate_settings_daemon();
+
+ GtkWidget *keyboard_notebook;
+ keyboard_notebook = GTK_WIDGET(gtk_builder_get_object(builder, "keyboard_notebook"));
+ gtk_notebook_remove_page(GTK_NOTEBOOK(keyboard_notebook), 2);
+
+ activate_settings_daemon();
keyboard_settings = g_settings_new (KEYBOARD_SCHEMA);
interface_settings = g_settings_new (INTERFACE_SCHEMA);
View
1 panels/time-data/spy-time.c
@@ -625,7 +625,6 @@ void add_time_and_data_app(GtkBuilder * builder){
// label_format = GTK_WIDGET(gtk_builder_get_object(builder, "label37"));
// gtk_widget_hide(GTK_RADIO_BUTTON(hr12_radio));
// gtk_widget_hide(GTK_WIDGET(hr24_radio));
-// g_warning("ssssssssssss");
// gtk_widget_hide(label_format);
// g_signal_connect(hr12_radio, "button_release_event", G_CALLBACK(change_hr_format), NULL);
View
42 panels/volume-control/gvc-channel-bar.c
@@ -111,14 +111,14 @@ _scale_box_new (GvcChannelBar *bar)
GtkWidget *ebox;
if (priv->orientation == GTK_ORIENTATION_VERTICAL) {
- bar->priv->scale_box = box = gtk_vbox_new (FALSE, 6);
+ bar->priv->scale_box = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
- priv->scale = gtk_vscale_new (priv->adjustment);
+ priv->scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, priv->adjustment);
gtk_widget_set_size_request (priv->scale, -1, SCALE_SIZE);
gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE);
- bar->priv->start_box = sbox = gtk_vbox_new (FALSE, 6);
+ bar->priv->start_box = sbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (box), sbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (sbox), priv->image, FALSE, FALSE, 0);
@@ -128,21 +128,21 @@ _scale_box_new (GvcChannelBar *bar)
gtk_widget_hide (priv->high_image);
gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0);
- bar->priv->end_box = ebox = gtk_vbox_new (FALSE, 6);
+ bar->priv->end_box = ebox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (box), ebox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (ebox), priv->low_image, FALSE, FALSE, 0);
gtk_widget_hide (priv->low_image);
gtk_box_pack_start (GTK_BOX (ebox), priv->mute_box, FALSE, FALSE, 0);
} else {
- bar->priv->scale_box = box = gtk_hbox_new (FALSE, 6);
+ bar->priv->scale_box = box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- priv->scale = gtk_hscale_new (priv->adjustment);
+ priv->scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, priv->adjustment);
gtk_widget_set_size_request (priv->scale, SCALE_SIZE, -1);
- bar->priv->start_box = sbox = gtk_hbox_new (FALSE, 6);
+ bar->priv->start_box = sbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box), sbox, FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX (sbox), priv->low_image, FALSE, FALSE, 0);
@@ -152,7 +152,7 @@ _scale_box_new (GvcChannelBar *bar)
gtk_box_pack_start (GTK_BOX (sbox), priv->label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0);
- bar->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
+ bar->priv->end_box = ebox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (box), ebox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (ebox), priv->high_image, FALSE, FALSE, 0);
@@ -391,8 +391,8 @@ on_scale_button_press_event (GtkWidget *widget,
* step increments, clicking with the middle button moves the slider to
* the location of the click.
*/
- if (event->button == 1)
- event->button = 2;
+// if (event->button == 1)
+// event->button = 2;
bar->priv->click_lock = TRUE;
@@ -407,8 +407,8 @@ on_scale_button_release_event (GtkWidget *widget,
GtkAdjustment *adj;
gdouble value;
/* HACK: see on_scale_button_press_event() */
- if (event->button == 1)
- event->button = 2;
+// if (event->button == 1)
+// event->button = 2;
bar->priv->click_lock = FALSE;
@@ -602,18 +602,18 @@ gvc_channel_bar_set_is_amplified (GvcChannelBar *bar, gboolean amplified)
char *str;
if (bar->priv->base_volume == ADJUSTMENT_MAX_NORMAL) {
- str = g_strdup_printf ("<small>%s</small>", _("volume"), "100%");
-// gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
-// GTK_POS_BOTTOM, str);
+ str = g_strdup_printf ("<small>%s</small>", "100%");
+ gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
+ GTK_POS_BOTTOM, str);
} else {
- str = g_strdup_printf ("<small>%s</small>", _("volume"), _("Unamplified"));
-// gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), bar->priv->base_volume,
-// GTK_POS_BOTTOM, str);
+ str = g_strdup_printf ("<small>%s</small>", _("Unamplified"));
+ gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), bar->priv->base_volume,
+ GTK_POS_BOTTOM, str);
/* Only show 100% if it's higher than the base volume */
if (bar->priv->base_volume < ADJUSTMENT_MAX_NORMAL) {
- str = g_strdup_printf ("<small>%s</small>", _("volume"), "100%");
-// gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
-// GTK_POS_BOTTOM, str);
+ str = g_strdup_printf ("<small>%s</small>", "100%");
+ gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
+ GTK_POS_BOTTOM, str);
}
}
Oops, something went wrong.

0 comments on commit 6e7769e

Please sign in to comment.