Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/Remmina/Remmina.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntenore Gatta <antenore@simbiosi.org>2018-06-09 00:30:41 +0300
committerAntenore Gatta <antenore@simbiosi.org>2018-06-09 00:30:41 +0300
commit7adac054b5244d7965a6b3268aabec2a8eae7270 (patch)
tree0fa0338773f13709fb0885a12f8d420634f3c0bb
parent8fca50b2c18c8c82d193adc205cdfe3968475c51 (diff)
Removed colour chooser
-rw-r--r--data/ui/remmina_preferences.glade29
-rw-r--r--src/remmina_pref.c7
-rw-r--r--src/remmina_pref.h3
-rw-r--r--src/remmina_pref_dialog.c7
-rw-r--r--src/remmina_pref_dialog.h2
5 files changed, 0 insertions, 48 deletions
diff --git a/data/ui/remmina_preferences.glade b/data/ui/remmina_preferences.glade
index 0a86853c4..3750ebe99 100644
--- a/data/ui/remmina_preferences.glade
+++ b/data/ui/remmina_preferences.glade
@@ -555,35 +555,6 @@ Author: Antenore Gatta
<property name="top_attach">3</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="label_icons_colour">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Icons colour</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">8</property>
- </packing>
- </child>
- <child>
- <object class="GtkColorButton" id="colorbutton_icons">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">NOT YET IMPLEMENTED. Remimna Icons are black by default.
-You can choose a color that matches your theme colour.</property>
- <property name="rgba">rgb(0,0,0)</property>
- <property name="show_editor">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">8</property>
- <property name="width">2</property>
- </packing>
- </child>
</object>
</child>
</object>
diff --git a/src/remmina_pref.c b/src/remmina_pref.c
index d429ea6f9..5dc4a9331 100644
--- a/src/remmina_pref.c
+++ b/src/remmina_pref.c
@@ -438,12 +438,6 @@ void remmina_pref_init(void)
remmina_pref.fullscreen_toolbar_visibility = g_key_file_get_integer(gkeyfile, "remmina_pref", "fullscreen_toolbar_visibility", NULL);
else
remmina_pref.fullscreen_toolbar_visibility = FLOATING_TOOLBAR_VISIBILITY_PEEKING;
- /* Icons colour */
- if (g_key_file_has_key(gkeyfile, "remmina_pref", "icons_colour", NULL))
- remmina_pref.icons_colour = g_key_file_get_string(gkeyfile, "remmina_pref", "icons_colour",
- NULL);
- else
- remmina_pref.icons_colour = "#000000";
/* Show buttons icons */
if (g_key_file_has_key(gkeyfile, "remmina_pref", "show_buttons_icons", NULL)) {
remmina_pref.show_buttons_icons = g_key_file_get_integer(gkeyfile, "remmina_pref", "show_buttons_icons", NULL);
@@ -743,7 +737,6 @@ void remmina_pref_save(void)
g_key_file_set_integer(gkeyfile, "remmina_pref", "toolbar_placement", remmina_pref.toolbar_placement);
g_key_file_set_boolean(gkeyfile, "remmina_pref", "prevent_snap_welcome_message", remmina_pref.prevent_snap_welcome_message);
g_key_file_set_boolean(gkeyfile, "remmina_pref", "fullscreen_on_auto", remmina_pref.fullscreen_on_auto);
- g_key_file_set_string(gkeyfile, "remmina_pref", "icons_colour", remmina_pref.icons_colour ? remmina_pref.icons_colour : "");
g_key_file_set_boolean(gkeyfile, "remmina_pref", "always_show_tab", remmina_pref.always_show_tab);
g_key_file_set_boolean(gkeyfile, "remmina_pref", "hide_connection_toolbar", remmina_pref.hide_connection_toolbar);
g_key_file_set_integer(gkeyfile, "remmina_pref", "default_action", remmina_pref.default_action);
diff --git a/src/remmina_pref.h b/src/remmina_pref.h
index f08dcd812..75e3be464 100644
--- a/src/remmina_pref.h
+++ b/src/remmina_pref.h
@@ -164,9 +164,6 @@ typedef struct _RemminaPref {
/* UID */
gchar *uid;
- /* Icons colour */
- gchar *icons_colour;
-
/* Color palette for VTE terminal */
gchar *background;
gchar *cursor;
diff --git a/src/remmina_pref_dialog.c b/src/remmina_pref_dialog.c
index f4dfc0998..f51dfc9c5 100644
--- a/src/remmina_pref_dialog.c
+++ b/src/remmina_pref_dialog.c
@@ -178,8 +178,6 @@ void remmina_pref_on_dialog_destroy(GtkWidget *widget, gpointer user_data)
remmina_pref.default_mode = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_view_mode);
remmina_pref.tab_mode = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_tab_interface);
remmina_pref.fullscreen_toolbar_visibility = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_fullscreen_toolbar_visibility);
- gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_icons), &color);
- remmina_pref.icons_colour = gdk_rgba_to_string(&color);
remmina_pref.show_buttons_icons = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_show_buttons_icons);
remmina_pref.show_menu_icons = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_appearance_show_menu_icons);
remmina_pref.scale_quality = gtk_combo_box_get_active(remmina_pref_dialog->comboboxtext_options_scale_quality);
@@ -431,9 +429,6 @@ static void remmina_pref_dialog_init(void)
}
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_terminal_bold), remmina_pref.vte_allow_bold_text);
- /* Icons color option */
- gdk_rgba_parse(&color, remmina_pref.icons_colour);
- gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_icons), &color);
/* Foreground color option */
gdk_rgba_parse(&color, remmina_pref.foreground);
gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_foreground), &color);
@@ -593,8 +588,6 @@ GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent)
remmina_pref_dialog->button_keyboard_copy = GTK_BUTTON(GET_OBJECT("button_keyboard_copy"));
remmina_pref_dialog->button_keyboard_paste = GTK_BUTTON(GET_OBJECT("button_keyboard_paste"));
remmina_pref_dialog->button_keyboard_select_all = GTK_BUTTON(GET_OBJECT("button_keyboard_select_all"));
- remmina_pref_dialog->label_icons_colour = GTK_LABEL(GET_OBJECT("label_icons_colour"));
- remmina_pref_dialog->colorbutton_icons = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_icons"));
remmina_pref_dialog->label_terminal_foreground = GTK_LABEL(GET_OBJECT("label_terminal_foreground"));
remmina_pref_dialog->colorbutton_foreground = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_foreground"));
remmina_pref_dialog->label_terminal_background = GTK_LABEL(GET_OBJECT("label_terminal_background"));
diff --git a/src/remmina_pref_dialog.h b/src/remmina_pref_dialog.h
index 3ba30e49b..911638719 100644
--- a/src/remmina_pref_dialog.h
+++ b/src/remmina_pref_dialog.h
@@ -97,8 +97,6 @@ typedef struct _RemminaPrefDialog {
GtkFontButton *fontbutton_terminal_font;
GtkCheckButton *checkbutton_terminal_bold;
GtkCheckButton *checkbutton_terminal_system_colors;
- GtkLabel *label_icons_colour;
- GtkColorButton *colorbutton_icons;
GtkLabel *label_terminal_foreground;
GtkColorButton *colorbutton_foreground;
GtkLabel *label_terminal_background;