Commit d97920eb authored by Antenore Gatta's avatar Antenore Gatta

Removed survey to clean up the code

parent 900348b7
......@@ -158,22 +158,11 @@ find_required_package(PTHREAD)
find_suggested_package(GCRYPT)
find_suggested_package(AVAHI)
# Survey URI
set(REMMINA_SURVEY_URI "http://www.remmina.org/survey/survey.tpl")
if(WITH_TRACE_CALLS)
message(STATUS "Enabling trace calls.")
add_definitions(-DWITH_TRACE_CALLS)
endif()
option(WITH_SURVEY "Build with SURVEY" ON)
if(WITH_SURVEY)
message(STATUS "Enabling Survey.")
add_definitions(-DWITH_SURVEY)
else()
message(STATUS "Survey disabled")
endif()
option(WITH_MANPAGES "Build with MANPAGES" ON)
if(WITH_MANPAGES)
message(STATUS "Enabling man pages.")
......
......@@ -27,6 +27,4 @@
#define REMMINA_PLUGINDIR "${REMMINA_PLUGINDIR}"
#define REMMINA_UIDIR "${REMMINA_UIDIR}"
#define REMMINA_SURVEY_URI "${REMMINA_SURVEY_URI}"
#endif
......@@ -109,40 +109,10 @@ list(APPEND REMMINA_SRCS
"src/remmina_connection_window.h"
)
if(WITH_SURVEY)
# either of webkitpackages would do
pkg_search_module(WEBKIT2
webkit2gtk-4.0
webkit2gtk-3.0
)
if(WEBKIT2_FOUND)
list(APPEND REMMINA_SRCS
"src/remmina_survey.c"
"src/remmina_survey.h"
)
else(WEBKIT2_FOUND)
message(FATAL_ERROR "Either webkit2gtk-4.0 or webkit2gtk-3.0 is required")
endif(WEBKIT2_FOUND)
endif(WITH_SURVEY)
add_executable(remmina ${REMMINA_SRCS})
include_directories(${GTK_INCLUDE_DIRS})
target_link_libraries(remmina ${GTK_LIBRARIES})
if(WITH_SURVEY)
if(WEBKIT2_FOUND)
message(STATUS "Found Webkit2gtk ${WEBKIT2_VERSION}")
include_directories(
${WEBKIT2_INCLUDE_DIRS}
)
link_directories(
${WEBKIT2_LIBRARY_DIRS}
)
add_definitions(${WEBKIT2_CFLAGS_OTHER})
target_link_libraries(remmina ${WEBKIT2_LIBRARIES})
endif(WEBKIT2_FOUND)
endif(WITH_SURVEY)
if(WITH_MANPAGES)
install (FILES src/remmina.1 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
endif(WITH_MANPAGES)
......
remmina/src/remmina_ftp_client.c
remmina/src/remmina_crypt.c
remmina/src/remmina_avahi.c
remmina/src/remmina_survey.c
remmina/src/remmina_applet_menu_item.c
remmina/src/remmina_key_chooser.c
remmina/src/remmina_plugin_manager.c
remmina/src/remmina_exec.c
remmina/src/remmina_public.c
remmina/src/remmina_connection_window.c
remmina/src/remmina_external_tools.c
remmina/src/remmina_string_list.c
remmina/src/remmina_plugin_cmdexec.c
remmina/src/remmina_ssh.c
remmina-plugins/spice/spice_plugin_usb.c
remmina-plugins/spice/spice_plugin.c
remmina-plugins/spice/spice_plugin_file_transfer.c
remmina-plugins/telepathy/telepathy_handler.c
remmina-plugins/telepathy/telepathy_plugin.c
remmina-plugins/telepathy/telepathy_channel_handler.c
remmina-plugins/xdmcp/xdmcp_plugin.c
remmina-plugins/rdp/rdp_settings.c
remmina-plugins/rdp/rdp_cliprdr.c
remmina-plugins/rdp/rdp_plugin.c
remmina-plugins/rdp/rdp_graphics.c
remmina-plugins/rdp/rdp_channels.c
remmina-plugins/rdp/rdp_event.c
remmina-plugins/rdp/rdp_file.c
remmina-plugins/tool_hello_world/plugin.c
remmina-plugins/nx/nx_plugin.c
remmina-plugins/nx/nx_session.c
remmina-plugins/nx/nx_session_manager.c
remmina-plugins/vnc/vnc_plugin.c
remmina-plugins-gnome/src/glibsecret_plugin.c
remmina/src/remmina_chat_window.c
remmina/src/remmina_marshals.c
remmina/src/remmina_pref.c
remmina/src/remmina_plugin_manager.c
remmina/src/remmina_about.c
remmina/src/remmina.c
remmina/src/remmina_sftp_client.c
remmina/src/remmina_sftp_plugin.c
remmina/src/remmina_ssh_plugin.c
remmina/src/remmina_main.c
remmina/src/remmina_applet_menu.c
remmina/src/remmina_file_manager.c
remmina/src/remmina_string_array.c
remmina/src/remmina_chat_window.c
remmina/src/remmina_about.c
remmina/src/remmina_icon.c
remmina/src/remmina_key_chooser.c
remmina/src/remmina_init_dialog.c
remmina/src/remmina_scrolled_viewport.c
remmina/src/remmina_masterthread_exec.c
remmina/src/remmina_log.c
remmina/src/remmina_protocol_widget.c
remmina/src/remmina_file_editor.c
remmina/src/remmina_sftp_client.c
remmina/src/remmina_ssh.c
remmina/src/remmina_scrolled_viewport.c
remmina/src/remmina_file_manager.c
remmina/src/remmina_pref_dialog.c
remmina/src/remmina_masterthread_exec.c
remmina/src/remmina_log.c
remmina/src/remmina_sftp_plugin.c
remmina/src/remmina_file.c
remmina/src/remmina_ssh_plugin.c
remmina/src/remmina_external_tools.c
remmina/src/remmina_crypt.c
remmina/src/remmina_icon.c
remmina/src/remmina_sysinfo.c
remmina/src/remmina.c
remmina/src/remmina_public.c
remmina/src/remmina_applet_menu.c
remmina/src/remmina_file.c
remmina/src/remmina_widget_pool.c
remmina-plugins-gnome/src/glibsecret_plugin.c
remmina-plugins/tool_hello_world/plugin.c
remmina-plugins/vnc/vnc_plugin.c
remmina-plugins/xdmcp/xdmcp_plugin.c
remmina-plugins/nx/nx_plugin.c
remmina-plugins/nx/nx_session_manager.c
remmina-plugins/nx/nx_session.c
remmina-plugins/rdp/rdp_file.c
remmina-plugins/rdp/rdp_plugin.c
remmina-plugins/rdp/rdp_graphics.c
remmina-plugins/rdp/rdp_cliprdr.c
remmina-plugins/rdp/rdp_channels.c
remmina-plugins/rdp/rdp_event.c
remmina-plugins/rdp/rdp_settings.c
remmina-plugins/spice/spice_plugin_file_transfer.c
remmina-plugins/spice/spice_plugin.c
remmina-plugins/spice/spice_plugin_usb.c
remmina-plugins/telepathy/telepathy_plugin.c
remmina-plugins/telepathy/telepathy_channel_handler.c
remmina-plugins/telepathy/telepathy_handler.c
remmina/ui/remmina_survey.glade
remmina/ui/remmina_string_list.glade
remmina/ui/remmina_spinner.glade
remmina/src/remmina_avahi.c
remmina/src/remmina_applet_menu_item.c
remmina/src/remmina_ftp_client.c
remmina/src/remmina_string_list.c
remmina/src/remmina_exec.c
remmina/src/remmina_connection_window.c
remmina/src/remmina_plugin_cmdexec.c
remmina/src/remmina_pref.c
remmina/ui/remmina_key_chooser.glade
remmina/ui/remmina_preferences.glade
remmina/ui/remmina_about.glade
remmina/ui/remmina_spinner.glade
remmina/ui/remmina_string_list.glade
remmina/ui/remmina_main.glade
remmina/ui/remmina_preferences.glade
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -56,10 +56,8 @@
#include "remmina_log.h"
#include "remmina/remmina_trace_calls.h"
#ifndef WITH_SURVEY
gchar *remmina_pref_file;
RemminaPref remmina_pref;
#endif /* WITH_SURVEY */
G_DEFINE_TYPE( RemminaConnectionWindow, remmina_connection_window, GTK_TYPE_WINDOW)
......
......@@ -47,9 +47,6 @@
#include "remmina_about.h"
#include "remmina_plugin_manager.h"
#include "remmina_exec.h"
#ifdef WITH_SURVEY
#include "remmina_survey.h"
#endif /* WITH_SURVEY */
#include "remmina_icon.h"
#include "remmina/remmina_trace_calls.h"
......@@ -110,15 +107,6 @@ void remmina_exec_command(RemminaCommandType command, const gchar* data)
{
widget = remmina_main_new();
gtk_widget_show(widget);
#ifdef WITH_SURVEY
/* Remmina survey reminder popup */
mainwindow = remmina_main_get_window();
if ( remmina_pref.survey && remmina_survey_valid_profile())
{
/* test if network is up and start survey */
remmina_survey_cb(GTK_WINDOW(mainwindow));
}
#endif /* WITH_SURVEY */
}
break;
......
......@@ -54,9 +54,6 @@
#include "remmina_exec.h"
#include "remmina_external_tools.h"
#include "remmina/remmina_trace_calls.h"
#ifdef WITH_SURVEY
#include "remmina_survey.h"
#endif /* WITH_SURVEY */
static RemminaMain *remminamain;
......@@ -909,24 +906,6 @@ void remmina_main_on_action_help_debug(GtkAction *action, gpointer user_data)
remmina_log_start();
}
void remmina_main_on_action_help_survey(GtkAction *action, gpointer user_data)
{
TRACE_CALL("remmina_main_on_action_help_survey");
#ifdef WITH_SURVEY
remmina_survey_start(remminamain->window);
#else
GtkWidget* dialog;
dialog = gtk_message_dialog_new(NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK,
_("Warning: The survey hasn't been enabled at compile time."));
g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), NULL);
gtk_widget_show(dialog);
#endif /* WITH_SURVEY */
}
void remmina_main_on_action_application_about(GtkAction *action, gpointer user_data)
{
TRACE_CALL("remmina_main_on_action_application_about");
......@@ -1191,9 +1170,6 @@ GtkWidget* remmina_main_new(void)
remminamain->action_help_homepage = GTK_ACTION(GET_OBJECT("action_help_homepage"));
remminamain->action_help_wiki = GTK_ACTION(GET_OBJECT("action_help_wiki"));
remminamain->action_help_debug = GTK_ACTION(GET_OBJECT("action_help_debug"));
#ifdef WITH_SURVEY
remminamain->action_help_survey = GTK_ACTION(GET_OBJECT("action_help_survey"));
#endif /* WITH_SURVEY */
G_GNUC_END_IGNORE_DEPRECATIONS
/* Connect signals */
gtk_builder_connect_signals(remminamain->builder, NULL);
......
......@@ -88,10 +88,6 @@ typedef struct _RemminaMain
GtkAction *action_help_homepage;
GtkAction *action_help_wiki;
GtkAction *action_help_debug;
#ifdef WITH_SURVEY
GtkAction *action_help_survey;
#endif /* WITH_SURVEY */
RemminaMainPriv *priv;
} RemminaMain;
......
......@@ -93,74 +93,6 @@ static void remmina_pref_gen_secret(void)
g_free(content);
}
/* This function will generate a unique string to identify a remmina installation
* in a form like Linux+4.2.5-1-ARCH+x86_64+38637228 */
static void remmina_pref_gen_uid(void)
{
TRACE_CALL("remmina_pref_gen_uid");
GKeyFile *gkeyfile;
gchar buf[64];
gchar *content;
gsize length;
const char *env_lang;
env_lang = g_getenv ("LANG");
if (env_lang == NULL)
env_lang = "NA";
struct utsname name;
uname(&name);
g_snprintf (buf, sizeof(buf), "%s+%s+%s+%s+%x%x%x%x%x%x%x%x",
name.sysname, name.release, name.machine,
env_lang,
g_random_int_range(0,9),
g_random_int_range(0,9),
g_random_int_range(0,9),
g_random_int_range(0,9),
g_random_int_range(0,9),
g_random_int_range(0,9),
g_random_int_range(0,9),
g_random_int_range(0,9));
remmina_pref.uid = g_strdup(buf);
gkeyfile = g_key_file_new();
g_key_file_load_from_file(gkeyfile, remmina_pref_file, G_KEY_FILE_NONE, NULL);
g_key_file_set_string(gkeyfile, "remmina_pref", "uid", remmina_pref.uid);
content = g_key_file_to_data(gkeyfile, &length, NULL);
g_file_set_contents(remmina_pref_file, content, length, NULL);
g_key_file_free(gkeyfile);
g_free(content);
}
/* used to save the current date the first time we execute remmina */
static void remmina_pref_birthday(void)
{
TRACE_CALL("remmina_pref_birthday");
GKeyFile *gkeyfile;
gchar *content;
gsize length;
GDate *today = g_date_new();
g_date_set_time_t(today, time(NULL));
remmina_pref.bdate = g_date_get_julian(today);
g_date_free(today);
gkeyfile = g_key_file_new();
g_key_file_load_from_file(gkeyfile, remmina_pref_file, G_KEY_FILE_NONE, NULL);
g_key_file_set_integer(gkeyfile, "remmina_pref", "bdate", remmina_pref.bdate);
content = g_key_file_to_data(gkeyfile, &length, NULL);
g_file_set_contents(remmina_pref_file, content, length, NULL);
g_key_file_free(gkeyfile);
g_free(content);
}
static guint remmina_pref_get_keyval_from_str(const gchar *str)
{
TRACE_CALL("remmina_pref_get_keyval_from_str");
......@@ -318,13 +250,6 @@ void remmina_pref_init(void)
else
remmina_pref.save_when_connect = TRUE;
#ifdef WITH_SURVEY
if (g_key_file_has_key(gkeyfile, "remmina_pref", "survey", NULL))
remmina_pref.survey = g_key_file_get_boolean(gkeyfile, "remmina_pref", "survey", NULL);
else
remmina_pref.survey = TRUE;
#endif /* WITH_SURVEY */
if (g_key_file_has_key(gkeyfile, "remmina_pref", "invisible_toolbar", NULL))
remmina_pref.invisible_toolbar = g_key_file_get_boolean(gkeyfile, "remmina_pref", "invisible_toolbar", NULL);
else
......@@ -648,12 +573,6 @@ void remmina_pref_init(void)
if (remmina_pref.secret == NULL)
remmina_pref_gen_secret();
if (remmina_pref.uid == NULL)
remmina_pref_gen_uid();
if (remmina_pref.bdate == 0)
remmina_pref_birthday();
remmina_pref_init_keymap();
}
......@@ -670,9 +589,6 @@ void remmina_pref_save(void)
g_key_file_set_boolean(gkeyfile, "remmina_pref", "save_view_mode", remmina_pref.save_view_mode);
g_key_file_set_boolean(gkeyfile, "remmina_pref", "save_when_connect", remmina_pref.save_when_connect);
#ifdef WITH_SURVEY
g_key_file_set_boolean(gkeyfile, "remmina_pref", "survey", remmina_pref.survey);
#endif /* WITH_SURVEY */
g_key_file_set_boolean(gkeyfile, "remmina_pref", "invisible_toolbar", remmina_pref.invisible_toolbar);
g_key_file_set_integer(gkeyfile, "remmina_pref", "floating_toolbar_placement", remmina_pref.floating_toolbar_placement);
g_key_file_set_integer(gkeyfile, "remmina_pref", "toolbar_placement", remmina_pref.toolbar_placement);
......@@ -888,14 +804,6 @@ gint remmina_pref_get_ssh_loglevel(void)
return remmina_pref.ssh_loglevel;
}
#ifdef WITH_SURVEY
gboolean remmina_pref_get_survey(void)
{
TRACE_CALL("remmina_pref_get_survey");
return remmina_pref.survey;
}
#endif /* WITH_SURVEY */
gboolean remmina_pref_get_ssh_parseconfig(void)
{
TRACE_CALL("remmina_pref_get_ssh_parseconfig");
......
......@@ -90,7 +90,6 @@ typedef struct _RemminaPref
/* In RemminaPrefDialog options tab */
gboolean save_view_mode;
gboolean save_when_connect;
gboolean survey;
gint default_action;
gint scale_quality;
const gchar *screenshot_path;
......@@ -177,10 +176,6 @@ extern RemminaPref remmina_pref;
void remmina_pref_init(void);
void remmina_pref_save(void);
#ifdef WITH_SURVEY
gboolean remmina_pref_get_survey(void);
#endif /* WITH_SURVEY */
void remmina_pref_add_recent(const gchar *protocol, const gchar *server);
gchar* remmina_pref_get_recent(const gchar *protocol);
void remmina_pref_clear_recent(void);
......
......@@ -125,9 +125,6 @@ void remmina_pref_on_dialog_destroy(GtkWidget *widget, gpointer user_data)
remmina_pref.save_view_mode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_remember_last_view_mode));
remmina_pref.save_when_connect = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_save_settings));
#ifdef WITH_SURVEY
remmina_pref.survey = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_survey));
#endif /* WITH_SURVEY */
remmina_pref.invisible_toolbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_invisible_toolbar));
remmina_pref.always_show_tab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_show_tabs));
remmina_pref.hide_connection_toolbar = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_hide_toolbar));
......@@ -289,9 +286,6 @@ static void remmina_pref_dialog_init(void)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_remember_last_view_mode), remmina_pref.save_view_mode);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_save_settings), remmina_pref.save_when_connect);
#ifdef WITH_SURVEY
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_options_survey), remmina_pref.survey);
#endif /* WITH_SURVEY */
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_invisible_toolbar), remmina_pref.invisible_toolbar);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_show_tabs), remmina_pref.always_show_tab);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_hide_toolbar), remmina_pref.hide_connection_toolbar);
......@@ -399,9 +393,6 @@ GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent)
remmina_pref_dialog->checkbutton_options_remember_last_view_mode = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_options_remember_last_view_mode"));
remmina_pref_dialog->checkbutton_options_save_settings = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_options_save_settings"));
#ifdef WITH_SURVEY
remmina_pref_dialog->checkbutton_options_survey = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_options_survey"));
#endif /* WITH_SURVEY */
remmina_pref_dialog->checkbutton_appearance_invisible_toolbar = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_appearance_invisible_toolbar"));
remmina_pref_dialog->checkbutton_appearance_show_tabs = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_appearance_show_tabs"));
remmina_pref_dialog->checkbutton_appearance_hide_toolbar = GTK_CHECK_BUTTON(GET_OBJECT("checkbutton_appearance_hide_toolbar"));
......
......@@ -52,9 +52,6 @@ typedef struct _RemminaPrefDialog
GtkCheckButton *checkbutton_options_remember_last_view_mode;
GtkCheckButton *checkbutton_options_save_settings;
#ifdef WITH_SURVEY
GtkCheckButton *checkbutton_options_survey;
#endif /* WITH_SURVEY */
GtkCheckButton *checkbutton_appearance_invisible_toolbar;
GtkCheckButton *checkbutton_appearance_show_tabs;
GtkCheckButton *checkbutton_appearance_hide_toolbar;
......
This diff is collapsed.
/*
* Remmina - The GTK+ Remote Desktop Client
* Copyright (C) 2014-2015 Antenore Gatta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of portions of this program with the
* OpenSSL library under certain conditions as described in each
* individual source file, and distribute linked combinations
* including the two.
* You must obey the GNU General Public License in all respects
* for all of the code used other than OpenSSL. * If you modify
* file(s) with this exception, you may extend this exception to your
* version of the file(s), but you are not obligated to do so. * If you
* do not wish to do so, delete this exception statement from your
* version. * If you delete this exception statement from all source
* files in the program, then also delete it here.
*
*/
#ifndef __REMMINASURVEY_H__
#define __REMMINASURVEY_H__
typedef struct _RemminaSurveyDialog
{
GtkBuilder *builder;
GtkDialog *dialog;
GtkScrolledWindow *scrolledwindow;
} RemminaSurveyDialog;
G_BEGIN_DECLS
gboolean remmina_survey_valid_profile();
void remmina_survey_on_startup(GtkWindow *parent);
gboolean remmina_survey_cb(gpointer data);
void remmina_survey_start(GtkWindow *parent);
G_END_DECLS
#endif /* __REMMINASURVEY_H__ */
......@@ -32,7 +32,6 @@
install(FILES remmina_about.glade DESTINATION "${REMMINA_UIDIR}")
install(FILES remmina_survey.glade DESTINATION "${REMMINA_UIDIR}")
install(FILES remmina_main.glade DESTINATION "${REMMINA_UIDIR}")
install(FILES remmina_spinner.glade DESTINATION "${REMMINA_UIDIR}")
install(FILES remmina_preferences.glade DESTINATION "${REMMINA_UIDIR}")
......
......@@ -170,13 +170,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<signal name="activate" handler="remmina_main_on_action_help_debug" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_help_survey">
<property name="label" translatable="yes">Survey</property>
<property name="short_label" translatable="yes">Survey</property>
<signal name="activate" handler="remmina_main_on_action_help_survey" swapped="no"/>
</object>
</child>
</object>
<object class="GtkActionGroup" id="actiongroup_tools">
<property name="accel_group">accelgroup_shortcuts</property>
......@@ -582,15 +575,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="use_stock">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menuitem_help_survey">
<property name="related_action">action_help_survey</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Survey</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem_quit_separator1">
<property name="visible">True</property>
......
......@@ -295,21 +295,6 @@ Author: Antenore Gatta
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="checkbutton_options_survey">
<property name="label" translatable="yes">Activate survey dialog on startup</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_options_screenshot_folder">
<property name="visible">True</property>
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.19.0
-
Copyright (C) 2014-2015 Antenore Gatta
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Author: Antenore Gatta
-->
<interface>
<requires lib="gtk+" version="3.10"/>
<!-- interface-license-type gplv2 -->
<!-- interface-copyright Copyright (C) 2014-2015 Antenore Gatta -->
<!-- interface-authors Antenore Gatta -->
<object class="GtkActionGroup" id="actiongroup_survey">
<child>
<object class="GtkAction" id="action_survey_close">
<property name="label" translatable="yes">Close</property>
<property name="stock_id">gtk-close</property>
<signal name="activate" handler="remmina_survey_dialog_on_close_clicked" swapped="no"/>
</object>
</child>
</object>
<object class="GtkDialog" id="dialog_remmina_survey">
<property name="can_focus">False</property>