diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2018-04-24 00:58:55 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2018-04-24 00:58:55 +0300 |
| commit | 83815cbad37b45e63233480b9ee4164c447c38ef (patch) | |
| tree | 4f1fca44c625d41bc9f22f8dcd24d6a31abfe1af | |
| parent | 2564d60c923ea75d34904a9ad115c6e6503423e6 (diff) | |
Added VTE color schemes
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | config.h.in | 9 | ||||
| -rw-r--r-- | remmina/src/remmina_pref_dialog.c | 5 | ||||
| -rw-r--r-- | remmina/src/remmina_pref_dialog.h | 2 | ||||
| -rw-r--r-- | remmina/ui/remmina_preferences.glade | 4 |
5 files changed, 15 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d1e67c35..c7833794a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,6 +127,9 @@ if(NOT REMMINA_DATADIR) set(REMMINA_RUNTIME_DATADIR "${REMMINA_DATADIR}") endif() endif() +if(NOT REMMINA_TERM_CS_DIR) + set(REMMINA_TERM_CS_DIR "${REMMINA_DATADIR}/remmina/term_colors") +endif() if(NOT REMMINA_LOCALEDIR) set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}") if(NOT REMMINA_RUNTIME_LOCALEDIR) @@ -224,6 +227,7 @@ endif() if(GTK_FOUND) add_subdirectory(remmina) + add_subdirectory(data) add_subdirectory(plugins) add_subdirectory(plugins/secret) endif() diff --git a/config.h.in b/config.h.in index 8f3a09b4f..ecac6c7a7 100644 --- a/config.h.in +++ b/config.h.in @@ -19,10 +19,11 @@ #define GETTEXT_PACKAGE remmina -#define REMMINA_RUNTIME_DATADIR "${REMMINA_RUNTIME_DATADIR}" -#define REMMINA_RUNTIME_LOCALEDIR "${REMMINA_RUNTIME_LOCALEDIR}" -#define REMMINA_RUNTIME_PLUGINDIR "${REMMINA_RUNTIME_PLUGINDIR}" -#define REMMINA_RUNTIME_UIDIR "${REMMINA_RUNTIME_UIDIR}" +#define REMMINA_RUNTIME_DATADIR "${REMMINA_RUNTIME_DATADIR}" +#define REMMINA_RUNTIME_LOCALEDIR "${REMMINA_RUNTIME_LOCALEDIR}" +#define REMMINA_RUNTIME_PLUGINDIR "${REMMINA_RUNTIME_PLUGINDIR}" +#define REMMINA_RUNTIME_UIDIR "${REMMINA_RUNTIME_UIDIR}" #define REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR "${REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR}" +#define REMMINA_RUNTIME_TERM_CS_DIR "${REMMINA_TERM_CS_DIR}" #endif diff --git a/remmina/src/remmina_pref_dialog.c b/remmina/src/remmina_pref_dialog.c index 773fbaffe..f0e144232 100644 --- a/remmina/src/remmina_pref_dialog.c +++ b/remmina/src/remmina_pref_dialog.c @@ -98,7 +98,7 @@ void remmina_pref_on_color_scheme_selected(GtkWidget *widget, gpointer user_data GFile *source; GFile *destination; - sourcepath = gtk_file_chooser_get_filename(remmina_pref_dialog->filechooserbutton_terminal_color_scheme); + sourcepath = gtk_file_chooser_get_filename(remmina_pref_dialog->button_term_cs); source = g_file_new_for_path(sourcepath); remmina_dir = g_build_path( "/", g_get_user_config_dir(), g_get_prgname(), NULL); @@ -602,7 +602,8 @@ GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent) remmina_pref_dialog->colorbutton_color15 = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_color15")); #if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE) #if VTE_CHECK_VERSION(0, 38, 0) - remmina_pref_dialog->filechooserbutton_terminal_color_scheme = GTK_FILE_CHOOSER(GET_OBJECT("filechooserbutton_terminal_color_scheme")); + remmina_pref_dialog->button_term_cs = GTK_FILE_CHOOSER(GET_OBJECT("button_term_cs")); + gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(remmina_pref_dialog->button_term_cs), REMMINA_RUNTIME_TERM_CS_DIR); #endif #endif diff --git a/remmina/src/remmina_pref_dialog.h b/remmina/src/remmina_pref_dialog.h index b83619dc8..911638719 100644 --- a/remmina/src/remmina_pref_dialog.h +++ b/remmina/src/remmina_pref_dialog.h @@ -125,7 +125,7 @@ typedef struct _RemminaPrefDialog { GtkColorButton *colorbutton_color13; GtkColorButton *colorbutton_color14; GtkColorButton *colorbutton_color15; - GtkFileChooser *filechooserbutton_terminal_color_scheme; + GtkFileChooser *button_term_cs; RemminaPrefDialogPriv *priv; } RemminaPrefDialog; diff --git a/remmina/ui/remmina_preferences.glade b/remmina/ui/remmina_preferences.glade index f3194581a..47b5d5be2 100644 --- a/remmina/ui/remmina_preferences.glade +++ b/remmina/ui/remmina_preferences.glade @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.0 +<!-- Generated with glade 3.22.0 Remmina Preferences Dialog - Copyright (C) Antenore Gatta & Giovanni Panozzo 2014-2018 @@ -1823,7 +1823,7 @@ Author: Antenore Gatta </packing> </child> <child> - <object class="GtkFileChooserButton" id="filechooserbutton_terminal_color_scheme"> + <object class="GtkFileChooserButton" id="button_term_cs"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Chose a color scheme file, You can download one from https://github.com/mbadolato/iTerm2-Color-Schemes.</property> |