diff options
117 files changed, 3419 insertions, 1497 deletions
@@ -7,6 +7,7 @@ Authors of Remmina Project Alexander Logvinov <avl@logvinov.com> Andreas <andreas.angerer89@gmail.com> Andrey Gankov <gankov@opensuse.org> + Andrey <gankov@opensuse.org> Antenore Gatta <antenore@simbiosi.org> Antonio Guillen <antonio@guillen.com.es> Armin Novak <armin.novak@gmail.com> @@ -25,6 +26,7 @@ Authors of Remmina Project dupondje <jean-louis@dupondje.be> e-alfred <e-alfred@users.noreply.github.com> Emmanuel Grognet <emmanuel@grognet.fr> + Eric Hoog <eric_hoog@hotmail.com> Frank Bongrand <fbongrand@free.fr> Funda Wang <fundawang@gmail.com> Giovanni Panozzo <giovanni@panozzo.it> @@ -32,6 +34,7 @@ Authors of Remmina Project Igor Vuk <parcijala@gmail.com> Iivo Raitahila <iivo.raitahila@korv.fi> Jakub Adam <jakub.adam@ktknet.cz> + Janne Blomqvist <janne.blomqvist@aalto.fi> Jay Carlson <nop@nop.com> Jean-Louis Dupond <jean-louis@dupond.be> Jen Herting <jen@herting.cc> @@ -42,12 +45,12 @@ Authors of Remmina Project Jose Gregorio Jimenez Sanchez <josegjimenez@gmail.com> Julian Ospald <hasufell@posteo.de> Justin Zobel <justin@solus-project.com> + Ken VanDine <kenvandine@users.noreply.github.com> Kirill Müller <krlmlr@users.noreply.github.com> Kyle Sanderson <kyle.leet@gmail.com> Laurentiu Nicola <lnicola@dend.ro> Luca Falavigna <dktrkranz@debian.org> Marc-André Moreau <marcandre.moreau@gmail.com> - Marco Trevisan <mail@3v1n0.net> Marco Trevisan (Treviño) <mail@3v1n0.net> Matteo F. Vescovi <mfvescovi+github@gmail.com> Matteo Nastasi <nastasi@alternativeoutput.it> @@ -55,12 +58,15 @@ Authors of Remmina Project Mike Dalessio <mike@csa.net> Mike Gilbert <floppym@gentoo.org> morph027 <morphsen@gmx.com> - nanxiongchao <nanxiongchao@loongson.cn> + Muflone <muflone@vbsimple.net> + Muflone <webreg@vbsimple.net> + nanxiongchao-loongson <nanxiongchao@loongson.cn> Nekhelesh Ramananthan <krnekhelesh@gmail.com> Nikolay Martynov <mar.kolya@gmail.com> Nils Steinger <git@n-st.de> Philippe Jandot <zfil@users.noreply.github.com> Raphael Kubo da Costa <rakuco@FreeBSD.org> + remminafan1 <32010086+remminafan1@users.noreply.github.com> Rene Rheaume <rene.rheaume@gmail.com> repzilon <repzilon@users.noreply.github.com> Rex Tsai <chihchun@kalug.linux.org.tw> @@ -71,6 +77,7 @@ Authors of Remmina Project Steve Russo svrusso1@gmail.com <svrusso1@gmail.com> Swen Kooij <photonios@outlook.com> Sylvain Pasche <sylvain.pasche@gmail.com> + Test User <andreas.angerer89@gmail.com> Vic Lee (llyzs) <llyzs.vic@gmail.com> theraser <mail@hegerfeld.org> diff --git a/CHANGELOG.md b/CHANGELOG.md index 477bc08e0..712b230f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,124 @@ # Change Log +## [v1.2.0-rcgit.22](https://github.com/FreeRDP/Remmina/tree/v1.2.0-rcgit.22) (2017-10-20) +[Full Changelog](https://github.com/FreeRDP/Remmina/compare/v1.2.0-rcgit.21...v1.2.0-rcgit.22) + +**Implemented enhancements:** + +- Add support for ayatana-appindicators [\#1309](https://github.com/FreeRDP/Remmina/pull/1309) ([giox069](https://github.com/giox069)) +- \[snap\] Use the new desktop, desktop-legacy and wayland interfaces [\#1306](https://github.com/FreeRDP/Remmina/pull/1306) ([kenvandine](https://github.com/kenvandine)) + +**Fixed bugs:** + +- Crashes when I try opening Preferences [\#1313](https://github.com/FreeRDP/Remmina/issues/1313) +- Resolution and Passwords Not Saving in Connection Profiles [\#1307](https://github.com/FreeRDP/Remmina/issues/1307) +- Add background and foreground colors for old versions of VTE [\#1318](https://github.com/FreeRDP/Remmina/pull/1318) ([antenore](https://github.com/antenore)) +- Make remmina\_file\_editor\_on\_save behave correcthly [\#1308](https://github.com/FreeRDP/Remmina/pull/1308) ([antenore](https://github.com/antenore)) + +**Closed issues:** + +- RDP connection profile settings are not used when opening session [\#1325](https://github.com/FreeRDP/Remmina/issues/1325) +- Remmina removes the desktop application bar when placed in fullscreen mode \(Linux Mint v18.2\) [\#1317](https://github.com/FreeRDP/Remmina/issues/1317) +- Remmina only shows black screen without any text after connection to an SSH server [\#1316](https://github.com/FreeRDP/Remmina/issues/1316) +- Shared file timestamp [\#1310](https://github.com/FreeRDP/Remmina/issues/1310) +- Tab size - SSH Sessions [\#1305](https://github.com/FreeRDP/Remmina/issues/1305) +- no rdp in the window option and no remmina command available in terminal [\#1302](https://github.com/FreeRDP/Remmina/issues/1302) +- Unsolvable dependencies on Debian 9 [\#1298](https://github.com/FreeRDP/Remmina/issues/1298) +- Remmina doesn't respect the `SSH Tunnel` `SSH authentication` `User name` setting [\#1278](https://github.com/FreeRDP/Remmina/issues/1278) +- Debian 9 - Remmina - RDP Plugin [\#1201](https://github.com/FreeRDP/Remmina/issues/1201) +- Win key stays pressed in remote desktop when remmina loses focus [\#1058](https://github.com/FreeRDP/Remmina/issues/1058) +- Remmina crashes after reconnection attempt after entering wrong password [\#1054](https://github.com/FreeRDP/Remmina/issues/1054) +- Remmina is not aware of additional screen added [\#938](https://github.com/FreeRDP/Remmina/issues/938) + +**Merged pull requests:** + +- Focus-out-event should call UNFOCUS plugin feature, fixes \#1058 [\#1315](https://github.com/FreeRDP/Remmina/pull/1315) ([giox069](https://github.com/giox069)) +- Fix some memory leaks [\#1314](https://github.com/FreeRDP/Remmina/pull/1314) ([giox069](https://github.com/giox069)) +- Dev documentation and Copyright update [\#1311](https://github.com/FreeRDP/Remmina/pull/1311) ([antenore](https://github.com/antenore)) + +## [v1.2.0-rcgit.21](https://github.com/FreeRDP/Remmina/tree/v1.2.0-rcgit.21) (2017-10-08) +[Full Changelog](https://github.com/FreeRDP/Remmina/compare/v1.2.0-rcgit.20...v1.2.0-rcgit.21) + +**Implemented enhancements:** + +- Feature Request: Create custom Terminal Color Schemes for SSH [\#1235](https://github.com/FreeRDP/Remmina/issues/1235) +- Enter key doesn't "Connect" when in Edit menu and password field is in focus [\#1233](https://github.com/FreeRDP/Remmina/issues/1233) +- Feature request - Option - Floating Desktop Name \[$5\] [\#815](https://github.com/FreeRDP/Remmina/issues/815) +- Don't close connection windows when main window is closed [\#785](https://github.com/FreeRDP/Remmina/issues/785) +- File association for connections [\#485](https://github.com/FreeRDP/Remmina/issues/485) +- Implementation of dynamic resolution update for RDP [\#1292](https://github.com/FreeRDP/Remmina/pull/1292) ([giox069](https://github.com/giox069)) +- Shortcutkey viewonly [\#1289](https://github.com/FreeRDP/Remmina/pull/1289) ([antenore](https://github.com/antenore)) +- Simplify pthreads library detection [\#1274](https://github.com/FreeRDP/Remmina/pull/1274) ([jabl](https://github.com/jabl)) +- Custom Color schemes for SSH [\#1272](https://github.com/FreeRDP/Remmina/pull/1272) ([antenore](https://github.com/antenore)) +- RDP client keyboard mapping with GTK3 [\#1265](https://github.com/FreeRDP/Remmina/pull/1265) ([giox069](https://github.com/giox069)) +- Make building the VNC plugin optional [\#1263](https://github.com/FreeRDP/Remmina/pull/1263) ([diogocp](https://github.com/diogocp)) + +**Fixed bugs:** + +- copy / paste and charset [\#1300](https://github.com/FreeRDP/Remmina/issues/1300) +- Changes user name ssh tunnel \(vnc over ssh\) do not save. [\#1255](https://github.com/FreeRDP/Remmina/issues/1255) +- SSH username ignored for Tunnels for RDP [\#1254](https://github.com/FreeRDP/Remmina/issues/1254) +- Can't Specify X :display for XDMCP. [\#1251](https://github.com/FreeRDP/Remmina/issues/1251) +- "Remember last view mode for each connection" not respected in v1.2.0-rcgit.19 [\#1247](https://github.com/FreeRDP/Remmina/issues/1247) +- Remmina always remember password [\#1224](https://github.com/FreeRDP/Remmina/issues/1224) +- Host key not working with SPICE plugin connected to KVM client. [\#1035](https://github.com/FreeRDP/Remmina/issues/1035) +- Shortcutkey viewonly [\#1289](https://github.com/FreeRDP/Remmina/pull/1289) ([antenore](https://github.com/antenore)) + +**Closed issues:** + +- Remmina VNC viewer window become freeze or unresponsive if remote Ubuntu pc connection dropped or shutdown [\#1296](https://github.com/FreeRDP/Remmina/issues/1296) +- support opensuse [\#1284](https://github.com/FreeRDP/Remmina/issues/1284) +- Remmina 1.2.0-rcgit.20 fails to build from source on sparc64 box [\#1283](https://github.com/FreeRDP/Remmina/issues/1283) +- WINPR\_INCLUDE\_DIR Set to not found [\#1281](https://github.com/FreeRDP/Remmina/issues/1281) +- Problem with latest pthread cmake patch and address sanitizer [\#1276](https://github.com/FreeRDP/Remmina/issues/1276) +- Remmina on Raspbian 9 Stretch and Remmina RemoteApp support [\#1269](https://github.com/FreeRDP/Remmina/issues/1269) +- Large file corruption over shared folder on RDP connection. [\#1266](https://github.com/FreeRDP/Remmina/issues/1266) +- Autoreconnect function with same credentials [\#1264](https://github.com/FreeRDP/Remmina/issues/1264) +- VNC plugin on Debian 9 \(stretch\) no longer available / working [\#1248](https://github.com/FreeRDP/Remmina/issues/1248) +- Graphics Flickering [\#1194](https://github.com/FreeRDP/Remmina/issues/1194) +- Can't connect to x509vnc on Fedora 25 [\#1171](https://github.com/FreeRDP/Remmina/issues/1171) +- RDP remote files are listed with huge wrong size under 32bit client platforms [\#1166](https://github.com/FreeRDP/Remmina/issues/1166) +- Printing PDF via Remmina and share local Printers on Linux Mint dont work [\#1158](https://github.com/FreeRDP/Remmina/issues/1158) +- Segfault when mousing out of latest remmina. [\#1152](https://github.com/FreeRDP/Remmina/issues/1152) +- Build 1.2.0-rcgit.x on Debian Jessie [\#1147](https://github.com/FreeRDP/Remmina/issues/1147) +- RDP to Windows 10 freezes/hangs [\#1139](https://github.com/FreeRDP/Remmina/issues/1139) +- FTBFS with both libfreerdp 1.2 and 2.0 installed [\#1137](https://github.com/FreeRDP/Remmina/issues/1137) +- Share folder date & time [\#934](https://github.com/FreeRDP/Remmina/issues/934) +- Copy/paste between Windows 10 guest and Remmina 1.2.0-rcgit.14 \(git n/a\) host [\#916](https://github.com/FreeRDP/Remmina/issues/916) +- Duplicate of issue\#99 on Remina 1.2.0 [\#844](https://github.com/FreeRDP/Remmina/issues/844) +- Shared clipboard with rdp [\#806](https://github.com/FreeRDP/Remmina/issues/806) +- Remmina crashes after 1st auth failure [\#798](https://github.com/FreeRDP/Remmina/issues/798) +- RDP Plugin Not Found [\#751](https://github.com/FreeRDP/Remmina/issues/751) +- Unable to connect to remote desktop after last update, error \(SIGSEGV\) [\#747](https://github.com/FreeRDP/Remmina/issues/747) +- Bug: unable to connect through gateway since 1.2.0-rcgit.8 [\#722](https://github.com/FreeRDP/Remmina/issues/722) +- not printing with remiina client 1.2 [\#707](https://github.com/FreeRDP/Remmina/issues/707) +- Copy&Paste of formatted text not working. [\#693](https://github.com/FreeRDP/Remmina/issues/693) +- \\tsclient shares disconnect when accessed by certain programs on server [\#686](https://github.com/FreeRDP/Remmina/issues/686) +- copy / paste and charset [\#685](https://github.com/FreeRDP/Remmina/issues/685) +- Cannot compile Remmina 1.0 on Linux mint 17.2 [\#658](https://github.com/FreeRDP/Remmina/issues/658) +- Minus "-" instead of slash "/" from numpad [\#656](https://github.com/FreeRDP/Remmina/issues/656) +- version 1.2 RDP/VNC "viewport fullscreen mode" causes problems when scaling is enabled [\#357](https://github.com/FreeRDP/Remmina/issues/357) + +**Merged pull requests:** + +- Fix charset conversion in VNC clipboard [\#1303](https://github.com/FreeRDP/Remmina/pull/1303) ([giox069](https://github.com/giox069)) +- Add support for application/x-remmina MIME type, fixes \#485 [\#1299](https://github.com/FreeRDP/Remmina/pull/1299) ([giox069](https://github.com/giox069)) +- Reverted the notfication for the floating toolbar [\#1297](https://github.com/FreeRDP/Remmina/pull/1297) ([antenore](https://github.com/antenore)) +- Fixes for notifications [\#1294](https://github.com/FreeRDP/Remmina/pull/1294) ([giox069](https://github.com/giox069)) +- Server name is notified to the user everytime we enter a tab [\#1290](https://github.com/FreeRDP/Remmina/pull/1290) ([antenore](https://github.com/antenore)) +- Exit strategy for Gnome Shell 3.26 [\#1287](https://github.com/FreeRDP/Remmina/pull/1287) ([giox069](https://github.com/giox069)) +- Fix gtk redrawing in RDP plugin [\#1286](https://github.com/FreeRDP/Remmina/pull/1286) ([giox069](https://github.com/giox069)) +- Gtk deprecations [\#1285](https://github.com/FreeRDP/Remmina/pull/1285) ([giox069](https://github.com/giox069)) +- Add Keywords entry [\#1277](https://github.com/FreeRDP/Remmina/pull/1277) ([mfvescovi](https://github.com/mfvescovi)) +- Runtime paths for AppImage [\#1271](https://github.com/FreeRDP/Remmina/pull/1271) ([giox069](https://github.com/giox069)) +- Get ssh\_username from remmina profile - fixes \#1255 [\#1267](https://github.com/FreeRDP/Remmina/pull/1267) ([antenore](https://github.com/antenore)) +- Better button labelling and new save button [\#1250](https://github.com/FreeRDP/Remmina/pull/1250) ([antenore](https://github.com/antenore)) + ## [v1.2.0-rcgit.20](https://github.com/FreeRDP/Remmina/tree/v1.2.0-rcgit.20) (2017-08-25) [Full Changelog](https://github.com/FreeRDP/Remmina/compare/v1.2.0-rcgit.19...v1.2.0-rcgit.20) **Implemented enhancements:** -- Enter key doesn't "Connect" when in Edit menu and password field is in focus [\#1233](https://github.com/FreeRDP/Remmina/issues/1233) - Set Linux as the default terminal color scheme. Fixes \#1238 [\#1243](https://github.com/FreeRDP/Remmina/pull/1243) ([antenore](https://github.com/antenore)) **Fixed bugs:** diff --git a/CMakeLists.txt b/CMakeLists.txt index fc06f98f9..d4685ac2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ # # Copyright (C) 2011 Marc-Andre Moreau # Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo +# Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo # # 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 @@ -107,7 +108,7 @@ set(WITH_LIBRARY_VERSIONING "ON") set(REMMINA_VERSION_MAJOR "1") set(REMMINA_VERSION_MINOR "2") set(REMMINA_VERSION_REVISION "0") -set(REMMINA_VERSION_SUFFIX "rcgit-20") +set(REMMINA_VERSION_SUFFIX "rcgit-22") set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}") if(NOT ${REMMINA_VERSION_SUFFIX} STREQUAL "") set(REMMINA_VERSION "${REMMINA_VERSION}-${REMMINA_VERSION_SUFFIX}") @@ -2,7 +2,7 @@ Remmina - The GTK+ Remote Desktop Client Copyright (C) 2009-2010 Vic Lee Copyright (C) 2011-2014 Marc-Andre Moreau - Copyright (C) 2014-2015 Antenore Gatta, Giovanni Panozzo + Copyright (C) 2015-2017 Antenore Gatta, Giovanni Panozzo 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 diff --git a/Doxyfile b/Doxyfile new file mode 100644 index 000000000..bff00ea27 --- /dev/null +++ b/Doxyfile @@ -0,0 +1,2432 @@ +# Doxyfile 1.8.13 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = "Remmina - The GTK+ Remote Desktop Client" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = 1.2.0 + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "Remmina is a remote desktop client written in GTK+, aiming to be useful for system administrators and travellers, who need to work with lots of remote computers in front of either large monitors or tiny netbooks. Remmina supports multiple network protocols in an integrated and consistent user interface. Currently RDP, VNC, NX, XDMCP and SSH are supported." + +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. + +PROJECT_LOGO = ./remmina/desktop/scalable/apps/remmina.svg + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = ../RemminaDoc/DoxyFiles + +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. + +CREATE_SUBDIRS = YES + +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = NO + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. + +ALIASES = + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up +# to that level are automatically included in the table of contents, even if +# they do not have an id attribute. +# Note: This feature currently applies only to Markdown headings. +# Minimum value: 0, maximum value: 99, default value: 0. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +TOC_INCLUDE_HEADINGS = 0 + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO, these declarations will be +# included in the documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES, upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. +# The default value is: system dependent. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if <section_label> ... \endif and \cond <section_label> +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. +# The default value is: NO. + +WARN_AS_ERROR = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING +# Note: If this tag is empty the current directory is searched. + +INPUT = . + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, +# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, +# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, +# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. + +FILE_PATTERNS = *.c \ + *.h \ + *.md + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# <filter> <input-file> +# +# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = NO + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler (hhc.exe). If non-empty, +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the master .chm file (NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = YES + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use <access key> + S +# (what the <access key> is depends on the OS and browser, but it is typically +# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down +# key> to jump into the search results window, the results can be navigated +# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel +# the search. The filter options can be selected when the cursor is inside the +# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys> +# to select a filter and <Enter> or <escape> to activate or cancel the filter +# option. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a web server instead of a web client using Javascript. There +# are two flavors of web server based searching depending on the EXTERNAL_SEARCH +# setting. When disabled, doxygen will generate a PHP script for searching and +# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing +# and searching needs to be provided by external tools. See the section +# "External Indexing and Searching" for details. +# The default value is: NO. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SERVER_BASED_SEARCH = NO + +# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP +# script for searching. Instead the search results are written to an XML file +# which needs to be processed by an external indexer. Doxygen will invoke an +# external search engine pointed to by the SEARCHENGINE_URL option to obtain the +# search results. +# +# Doxygen ships with an example indexer (doxyindexer) and search engine +# (doxysearch.cgi) which are based on the open source search engine library +# Xapian (see: http://xapian.org/). +# +# See the section "External Indexing and Searching" for details. +# The default value is: NO. +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTERNAL_SEARCH = NO + +# The SEARCHENGINE_URL should point to a search engine hosted by a web server +# which will return the search results when EXTERNAL_SEARCH is enabled. +# +# Doxygen ships with an example indexer (doxyindexer) and search engine +# (doxysearch.cgi) which are based on the open source search engine library +# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Searching" for details. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SEARCHENGINE_URL = + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed +# search data is written to a file for indexing by an external tool. With the +# SEARCHDATA_FILE tag the name of this file can be specified. +# The default file is: searchdata.xml. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SEARCHDATA_FILE = searchdata.xml + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the +# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is +# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple +# projects and redirect the results back to the right project. +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTERNAL_SEARCH_ID = + +# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen +# projects other than the one defined by this configuration file, but that are +# all added to the same external search index. Each project needs to have a +# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of +# to a relative location where the documentation can be found. The format is: +# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ... +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTRA_SEARCH_MAPPINGS = + +#--------------------------------------------------------------------------- +# Configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output. +# The default value is: YES. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: latex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. +# +# Note that when enabling USE_PDFLATEX this option is only used for generating +# bitmaps for formulas in the HTML output, but not in the Makefile that is +# written to the output directory. +# The default file is: latex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate +# index for LaTeX. +# The default file is: makeindex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX +# documents. This may be useful for small projects and may help to save some +# trees in general. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used by the +# printer. +# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x +# 14 inches) and executive (7.25 x 10.5 inches). +# The default value is: a4. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +PAPER_TYPE = a4 + +# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names +# that should be included in the LaTeX output. The package can be specified just +# by its name or with the correct syntax as to be used with the LaTeX +# \usepackage command. To get the times font for instance you can specify : +# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times} +# To use the option intlimits with the amsmath package you can specify: +# EXTRA_PACKAGES=[intlimits]{amsmath} +# If left blank no extra packages will be included. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the +# generated LaTeX document. The header should contain everything until the first +# chapter. If it is left blank doxygen will generate a standard header. See +# section "Doxygen usage" for information on how to let doxygen write the +# default header to a separate file. +# +# Note: Only use a user-defined header if you know what you are doing! The +# following commands have a special meaning inside the header: $title, +# $datetime, $date, $doxygenversion, $projectname, $projectnumber, +# $projectbrief, $projectlogo. Doxygen will replace $title with the empty +# string, for the replacement values of the other commands the user is referred +# to HTML_HEADER. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_HEADER = + +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the +# generated LaTeX document. The footer should contain everything after the last +# chapter. If it is left blank doxygen will generate a standard footer. See +# LATEX_HEADER for more information on how to generate a default footer and what +# special commands can be used inside the footer. +# +# Note: Only use a user-defined footer if you know what you are doing! +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_FOOTER = + +# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# LaTeX style sheets that are included after the standard style sheets created +# by doxygen. Using this option one can overrule certain style aspects. Doxygen +# will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EXTRA_STYLESHEET = + +# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the LATEX_OUTPUT output +# directory. Note that the files will be copied as-is; there are no commands or +# markers available. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EXTRA_FILES = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is +# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will +# contain links (just like the HTML output) instead of page references. This +# makes the output suitable for online browsing using a PDF viewer. +# The default value is: YES. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate +# the PDF file directly from the LaTeX files. Set this option to YES, to get a +# higher quality PDF documentation. +# The default value is: YES. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode +# command to the generated LaTeX files. This will instruct LaTeX to keep running +# if errors occur, instead of asking the user for help. This option is also used +# when generating formulas in HTML. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_BATCHMODE = NO + +# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the +# index chapters (such as File Index, Compound Index, etc.) in the output. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_HIDE_INDICES = NO + +# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source +# code with syntax highlighting in the LaTeX output. +# +# Note that which sources are shown also depends on other settings such as +# SOURCE_BROWSER. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_SOURCE_CODE = NO + +# The LATEX_BIB_STYLE tag can be used to specify the style to use for the +# bibliography, e.g. plainnat, or ieeetr. See +# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# The default value is: plain. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_BIB_STYLE = plain + +# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated +# page will contain the date and time when the page was generated. Setting this +# to NO can help when comparing the output of multiple runs. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_TIMESTAMP = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The +# RTF output is optimized for Word 97 and may not look too pretty with other RTF +# readers/editors. +# The default value is: NO. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: rtf. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF +# documents. This may be useful for small projects and may help to save some +# trees in general. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will +# contain hyperlink fields. The RTF file will contain links (just like the HTML +# output) instead of page references. This makes the output suitable for online +# browsing using Word or some other Word compatible readers that support those +# fields. +# +# Note: WordPad (write) and others do not support links. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's config +# file, i.e. a series of assignments. You only have to provide replacements, +# missing definitions are set to their default value. +# +# See also section "Doxygen usage" for information on how to generate the +# default style sheet that doxygen normally uses. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an RTF document. Syntax is +# similar to doxygen's config file. A template extensions file can be generated +# using doxygen -e rtf extensionFile. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_EXTENSIONS_FILE = + +# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code +# with syntax highlighting in the RTF output. +# +# Note that which sources are shown also depends on other settings such as +# SOURCE_BROWSER. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for +# classes and files. +# The default value is: NO. + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. A directory man3 will be created inside the directory specified by +# MAN_OUTPUT. +# The default directory is: man. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to the generated +# man pages. In case the manual section does not start with a number, the number +# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is +# optional. +# The default value is: .3. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_EXTENSION = .3 + +# The MAN_SUBDIR tag determines the name of the directory created within +# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by +# MAN_EXTENSION with the initial . removed. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_SUBDIR = + +# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it +# will generate one additional man file for each entity documented in the real +# man page(s). These additional files only source the real man page, but without +# them the man command would be unable to find the correct page. +# The default value is: NO. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that +# captures the structure of the code including all documentation. +# The default value is: NO. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: xml. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_OUTPUT = xml + +# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program +# listings (including syntax highlighting and cross-referencing information) to +# the XML output. Note that enabling this will significantly increase the size +# of the XML output. +# The default value is: YES. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- + +# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files +# that can be used to generate PDF. +# The default value is: NO. + +GENERATE_DOCBOOK = NO + +# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in +# front of it. +# The default directory is: docbook. +# This tag requires that the tag GENERATE_DOCBOOK is set to YES. + +DOCBOOK_OUTPUT = docbook + +# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the +# program listings (including syntax highlighting and cross-referencing +# information) to the DOCBOOK output. Note that enabling this will significantly +# increase the size of the DOCBOOK output. +# The default value is: NO. +# This tag requires that the tag GENERATE_DOCBOOK is set to YES. + +DOCBOOK_PROGRAMLISTING = NO + +#--------------------------------------------------------------------------- +# Configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an +# AutoGen Definitions (see http://autogen.sf.net) file that captures the +# structure of the code including all documentation. Note that this feature is +# still experimental and incomplete at the moment. +# The default value is: NO. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module +# file that captures the structure of the code including all documentation. +# +# Note that this feature is still experimental and incomplete at the moment. +# The default value is: NO. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary +# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI +# output from the Perl module output. +# The default value is: NO. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely +# formatted so it can be parsed by a human reader. This is useful if you want to +# understand what is going on. On the other hand, if this tag is set to NO, the +# size of the Perl module output will be much smaller and Perl will parse it +# just the same. +# The default value is: YES. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file are +# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful +# so different doxyrules.make files included by the same Makefile don't +# overwrite each other's variables. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all +# C-preprocessor directives found in the sources and include files. +# The default value is: YES. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names +# in the source code. If set to NO, only conditional compilation will be +# performed. Macro expansion can be done in a controlled way by setting +# EXPAND_ONLY_PREDEF to YES. +# The default value is: NO. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then +# the macro expansion is limited to the macros specified with the PREDEFINED and +# EXPAND_AS_DEFINED tags. +# The default value is: NO. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES, the include files in the +# INCLUDE_PATH will be searched if a #include is found. +# The default value is: YES. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by the +# preprocessor. +# This tag requires that the tag SEARCH_INCLUDES is set to YES. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will be +# used. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that are +# defined before the preprocessor is started (similar to the -D option of e.g. +# gcc). The argument of the tag is a list of macros of the form: name or +# name=definition (no spaces). If the definition and the "=" are omitted, "=1" +# is assumed. To prevent a macro definition from being undefined via #undef or +# recursively expanded use the := operator instead of the = operator. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this +# tag can be used to specify a list of macro names that should be expanded. The +# macro definition that is found in the sources will be used. Use the PREDEFINED +# tag if you want to use a different macro definition that overrules the +# definition found in the source code. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will +# remove all references to function-like macros that are alone on a line, have +# an all uppercase name, and do not end with a semicolon. Such function macros +# are typically used for boiler-plate code, and will confuse the parser if not +# removed. +# The default value is: YES. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES tag can be used to specify one or more tag files. For each tag +# file the location of the external documentation should be added. The format of +# a tag file without this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where loc1 and loc2 can be relative or absolute paths or URLs. See the +# section "Linking to external documentation" for more information about the use +# of tag files. +# Note: Each tag file must have a unique name (where the name does NOT include +# the path). If a tag file is not located in the directory in which doxygen is +# run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create a +# tag file that is based on the input files it reads. See section "Linking to +# external documentation" for more information about the usage of tag files. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES, all external class will be listed in +# the class index. If set to NO, only the inherited external classes will be +# listed. +# The default value is: NO. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will be +# listed. +# The default value is: YES. + +EXTERNAL_GROUPS = YES + +# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in +# the related pages index. If set to NO, only the current project's pages will +# be listed. +# The default value is: YES. + +EXTERNAL_PAGES = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of 'which perl'). +# The default file (with absolute path) is: /usr/bin/perl. + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram +# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to +# NO turns the diagrams off. Note that this option also works with HAVE_DOT +# disabled, but it is recommended to install and use dot, since it yields more +# powerful graphs. +# The default value is: YES. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see: +# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# You can include diagrams made with dia in doxygen documentation. Doxygen will +# then run dia to produce the diagram and insert it in the documentation. The +# DIA_PATH tag allows you to specify the directory where the dia binary resides. +# If left empty dia is assumed to be found in the default search path. + +DIA_PATH = + +# If set to YES the inheritance and collaboration graphs will hide inheritance +# and usage relations if the target is undocumented or is not a class. +# The default value is: YES. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz (see: +# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent +# Bell Labs. The other options in this section have no effect if this option is +# set to NO +# The default value is: NO. + +HAVE_DOT = YES + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed +# to run in parallel. When set to 0 doxygen will base this on the number of +# processors available in the system. You can set it explicitly to a value +# larger than 0 to get control over the balance between CPU load and processing +# speed. +# Minimum value: 0, maximum value: 32, default value: 0. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_NUM_THREADS = 0 + +# When you want a differently looking font in the dot files that doxygen +# generates you can specify the font name using DOT_FONTNAME. You need to make +# sure dot is able to find the font, which can be done by putting it in a +# standard location or by setting the DOTFONTPATH environment variable or by +# setting DOT_FONTPATH to the directory containing the font. +# The default value is: Helvetica. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTNAME = Helvetica + +# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of +# dot graphs. +# Minimum value: 4, maximum value: 24, default value: 10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the default font as specified with +# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set +# the path where dot can find it using this tag. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTPATH = + +# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for +# each documented class showing the direct and indirect inheritance relations. +# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a +# graph for each documented class showing the direct and indirect implementation +# dependencies (inheritance, containment, and class references variables) of the +# class with other documented classes. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for +# groups, showing the direct groups dependencies. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +UML_LOOK = NO + +# If the UML_LOOK tag is enabled, the fields and methods are shown inside the +# class node. If there are many fields or methods and many nodes the graph may +# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the +# number of items for each type to make the size more manageable. Set this to 0 +# for no limit. Note that the threshold may be exceeded by 50% before the limit +# is enforced. So when you set the threshold to 10, up to 15 fields may appear, +# but if the number exceeds 15, the total amount of fields shown is limited to +# 10. +# Minimum value: 0, maximum value: 100, default value: 10. +# This tag requires that the tag HAVE_DOT is set to YES. + +UML_LIMIT_NUM_FIELDS = 10 + +# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and +# collaboration graphs will show the relations between templates and their +# instances. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +TEMPLATE_RELATIONS = NO + +# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to +# YES then doxygen will generate a graph for each documented file showing the +# direct and indirect include dependencies of the file with other documented +# files. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +INCLUDE_GRAPH = YES + +# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are +# set to YES then doxygen will generate a graph for each documented file showing +# the direct and indirect include dependencies of the file with other documented +# files. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH tag is set to YES then doxygen will generate a call +# dependency graph for every global function or class method. +# +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. Disabling a call graph can be +# accomplished by means of the command \hidecallgraph. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +CALL_GRAPH = YES + +# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller +# dependency graph for every global function or class method. +# +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. Disabling a caller graph can be +# accomplished by means of the command \hidecallergraph. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +CALLER_GRAPH = YES + +# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical +# hierarchy of all classes instead of a textual one. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the +# dependencies a directory has on other directories in a graphical way. The +# dependency relations are determined by the #include relations between the +# files in the directories. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. For an explanation of the image formats see the section +# output formats in the documentation of the dot tool (Graphviz (see: +# http://www.graphviz.org/)). +# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order +# to make the SVG files visible in IE 9+ (other browsers do not have this +# requirement). +# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo, +# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and +# png:gdiplus:gdiplus. +# The default value is: png. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_IMAGE_FORMAT = png + +# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to +# enable generation of interactive SVG images that allow zooming and panning. +# +# Note that this requires a modern browser other than Internet Explorer. Tested +# and working are Firefox, Chrome, Safari, and Opera. +# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make +# the SVG files visible. Older versions of IE do not have SVG support. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +INTERACTIVE_SVG = NO + +# The DOT_PATH tag can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the \dotfile +# command). +# This tag requires that the tag HAVE_DOT is set to YES. + +DOTFILE_DIRS = + +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the \mscfile +# command). + +MSCFILE_DIRS = + +# The DIAFILE_DIRS tag can be used to specify one or more directories that +# contain dia files that are included in the documentation (see the \diafile +# command). + +DIAFILE_DIRS = + +# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the +# path where java can find the plantuml.jar file. If left blank, it is assumed +# PlantUML is not used or called during a preprocessing step. Doxygen will +# generate a warning when it encounters a \startuml command in this case and +# will not generate output for the diagram. + +PLANTUML_JAR_PATH = + +# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a +# configuration file for plantuml. + +PLANTUML_CFG_FILE = + +# When using plantuml, the specified paths are searched for files specified by +# the !include statement in a plantuml block. + +PLANTUML_INCLUDE_PATH = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes +# that will be shown in the graph. If the number of nodes in a graph becomes +# larger than this value, doxygen will truncate the graph, which is visualized +# by representing a node as a red box. Note that doxygen if the number of direct +# children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that +# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. +# Minimum value: 0, maximum value: 10000, default value: 50. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs +# generated by dot. A depth value of 3 means that only nodes reachable from the +# root by following a path via at most 3 edges will be shown. Nodes that lay +# further from the root node will be omitted. Note that setting this option to 1 +# or 2 may greatly reduce the computation time needed for large code bases. Also +# note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. +# Minimum value: 0, maximum value: 1000, default value: 0. +# This tag requires that the tag HAVE_DOT is set to YES. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not seem +# to support this out of the box. +# +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) support +# this, this feature is disabled by default. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page +# explaining the meaning of the various boxes and arrows in the dot generated +# graphs. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot +# files that are used to generate the various graphs. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_CLEANUP = YES @@ -122,6 +122,7 @@ Remmina support also the following options: -t, --protocol=PROTOCOL Use default protocol -i, --icon Start as tray icon -v, --version Show the application's version + -V, --full-version Show the application's version, including the pulgin versions --display=DISPLAY X display to use ``` @@ -170,6 +171,7 @@ Remmina is maintained by: * [Antenore Gatta](https://github.com/antenore) * [Giovanni Panozzo](https://github.com/giox069) + * [Dario Cavedon](https://github.com/ic3d) See the [AUTHORS](https://raw.githubusercontent.com/FreeRDP/Remmina/next/AUTHORS) for an exhaustive list. If you are not listed and you have contributed, feel free to update that file. @@ -20,20 +20,14 @@ These donors have contributed with an important amount of money during the year ### Year 2017 donors -- Andre Bultmann +- Anonymous (13) - Daniel Platteau +- Dmitry Yudin - Jakub Kubień -- Jonathan Nicol -- Kirk Sullivan - Leigh Mutimer - Luca Menini -- Michael Williams -- Mike Hwang - Paul Walker -- Pavel Zaitsev -- Roberto Resoli -- Samuel Gyger -- Vince Patron +- Tomasz Kubacki ## 2016 Sponsors diff --git a/cmake/FindAPPINDICATOR.cmake b/cmake/FindAPPINDICATOR.cmake index 924550494..62ba9cd5e 100644 --- a/cmake/FindAPPINDICATOR.cmake +++ b/cmake/FindAPPINDICATOR.cmake @@ -1,6 +1,8 @@ # Remmina - The GTK+ Remote Desktop Client # # Copyright (C) 2011 Marc-Andre Moreau +# Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo +# Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo # # 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 @@ -17,21 +19,40 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -pkg_check_modules(PC_APPINDICATOR appindicator3-0.1) +include(FindPackageHandleStandardArgs) -find_path(APPINDICATOR_INCLUDE_DIR NAMES libappindicator/app-indicator.h - HINTS ${PC_APPINDICATOR_INCLUDEDIR} ${PC_APPINDICATOR_INCLUDE_DIRS} - PATH_SUFFIXES libappindicator-0.1) +# Try with ayatana-libappindicator +pkg_check_modules(PC_AYATANA_APPINDICATOR ayatana-appindicator3-0.1) -find_library(APPINDICATOR_LIBRARY NAMES appindicator3) +find_path(AYATANA_APPINDICATOR_INCLUDE_DIR NAMES app-indicator.h + HINTS ${PC_AYATANA_APPINDICATOR_INCLUDEDIR} ${PC_AYATANA_APPINDICATOR_INCLUDE_DIRS} + PATH_SUFFIXES libayatana-appindicator3-0.1/libayatana-appindicator) -include(FindPackageHandleStandardArgs) +find_library(AYATANA_APPINDICATOR_LIBRARY NAMES ayatana-appindicator3) + +if (AYATANA_APPINDICATOR_INCLUDE_DIR AND AYATANA_APPINDICATOR_LIBRARY) + find_package_handle_standard_args(APPINDICATOR DEFAULT_MSG AYATANA_APPINDICATOR_LIBRARY AYATANA_APPINDICATOR_INCLUDE_DIR) +endif() + +if (APPINDICATOR_FOUND) + set(APPINDICATOR_LIBRARIES ${AYATANA_APPINDICATOR_LIBRARY}) + set(APPINDICATOR_INCLUDE_DIRS ${AYATANA_APPINDICATOR_INCLUDE_DIR}) +else() + # Try with normal libappindicator + pkg_check_modules(PC_APPINDICATOR appindicator3-0.1) + + find_path(APPINDICATOR_INCLUDE_DIR NAMES app-indicator.h + HINTS ${PC_APPINDICATOR_INCLUDEDIR} ${PC_APPINDICATOR_INCLUDE_DIRS} + PATH_SUFFIXES libappindicator3-0.1/libappindicator) + + find_library(APPINDICATOR_LIBRARY NAMES appindicator3) -find_package_handle_standard_args(APPINDICATOR DEFAULT_MSG APPINDICATOR_LIBRARY APPINDICATOR_INCLUDE_DIR) + find_package_handle_standard_args(APPINDICATOR DEFAULT_MSG APPINDICATOR_LIBRARY APPINDICATOR_INCLUDE_DIR) -if(APPINDICATOR_FOUND) - set(APPINDICATOR_LIBRARIES ${APPINDICATOR_LIBRARY}) - set(APPINDICATOR_INCLUDE_DIRS ${APPINDICATOR_INCLUDE_DIR}) + if(APPINDICATOR_FOUND) + set(APPINDICATOR_LIBRARIES ${APPINDICATOR_LIBRARY}) + set(APPINDICATOR_INCLUDE_DIRS ${APPINDICATOR_INCLUDE_DIR}) + endif() endif() mark_as_advanced(APPINDICATOR_INCLUDE_DIR APPINDICATOR_LIBRARY) diff --git a/docs/Development-Notes.md b/docs/Development-Notes.md deleted file mode 100644 index de990acf3..000000000 --- a/docs/Development-Notes.md +++ /dev/null @@ -1,75 +0,0 @@ -Use this page to add useful links and notes to help out with the development - -# GTK3 - -## GTK3 Deprecation mini guide - -* [GTK3 Reference Manual](https://developer.gnome.org/gtk3/unstable/index.html) -* [Icon names standard](http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html#names) -* [GTK+ Stock Item Deprecation](https://docs.google.com/document/d/1KCVPoYQBqMbDP11tHPpjW6uaEHrvLUmcDPqKAppCY8o/pub) -* [Stock Items Migration Guide](https://docs.google.com/spreadsheet/pub?key=0AsPAM3pPwxagdGF4THNMMUpjUW5xMXZfdUNzMXhEa2c&output=html) -* Menu and GtkActionGroup deprecation: [what to use instead](http://stackoverflow.com/questions/24788045/gtk-action-group-new-and-gtkstock-what-to-use-instead) -* _"GtkAlignment has been deprecated in 3.14 and should not be used in newly-written code. The desired effect can be achieved by using the “halign”, “valign” and “margin” properties on the child widget."_ In remmina GtkAlignment has been replaced by a GtkAspectFrame, used by the "scaler" code to scale the remote desktop. -* Icons in menu are being removed. See [here](https://igurublog.wordpress.com/2014/03/22/gtk-3-10-drops-menu-icons-and-mnemonics/). Also mnemonics should be removed. - -## Deprecated to be migrated in Remmina next - - * g_cond_free - * g_cond_new - * gdk_color_parse - * gdk_get_display - * gdk_threads_enter - * gdk_threads_init - * gdk_threads_leave - * g_io_channel_close - * g_io_channel_seek - * g_mutex_free - * g_mutex_new - * gnome_keyring_delete_password_sync - * gnome_keyring_find_password_sync - * gnome_keyring_free_password - * gnome_keyring_result_to_message - * gnome_keyring_store_password_sync - * gtk_action_group_add_action - * gtk_action_group_add_actions - * gtk_action_group_add_radio_actions - * gtk_action_group_add_toggle_actions - * gtk_action_group_get_action - * gtk_action_group_new - * gtk_action_group_set_translation_domain - * gtk_action_new - * gtk_alignment_get_type - * gtk_alignment_new - * gtk_alignment_set - * gtk_arrow_new - * gtk_dialog_get_action_area - * gtk_dialog_set_alternative_button_order - * gtk_entry_set_icon_from_stock - * gtk_image_menu_item_get_type - * gtk_image_menu_item_new_from_stock - * gtk_misc_get_type - * gtk_misc_set_alignment - * gtk_radio_action_get_current_value - * GtkStock - * gtk_table_attach - * gtk_table_attach_defaults - * gtk_table_get_type - * gtk_table_resize - * gtk_toggle_action_get_active - * gtk_toggle_action_get_type - * gtk_toggle_action_set_active - * gtk_ui_manager_add_ui - * gtk_ui_manager_add_ui_from_string - * gtk_ui_manager_get_accel_group - * gtk_ui_manager_get_widget - * gtk_ui_manager_insert_action_group - * gtk_ui_manager_new - * gtk_ui_manager_new_merge_id - * gtk_vbox_get_type - * gtk_widget_modify_fg - * gtk_widget_set_margin_right - * g_type_init - * vte_terminal_get_adjustment - - - diff --git a/docs/HOWTO-generate-the-changelog.md b/docs/HOWTO-generate-the-changelog.md deleted file mode 100644 index 08584b262..000000000 --- a/docs/HOWTO-generate-the-changelog.md +++ /dev/null @@ -1,24 +0,0 @@ -# Requirements - -## [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator) - -You can install using gem - -```sh -gem install github_changelog_generator -``` - -If you want to contribute back to the project you can clone the repository and build it. - -## [GitHub token](https://github.com/skywinder/github-changelog-generator/blob/master/README.md#github-token) - -You need the token because github doesn't accept more than 50 request per day with it's API. -It's for free... - -# Generate the CHANGELOG.md - -github_changelog_generator -t 689c2dd09acaebf4ce92fecaeed2ec8140b6bfbf - -# Commit the new CHANGELOG.md - -The CHANGELOG.md should be committed only after a new release.
\ No newline at end of file diff --git a/docs/README.md b/docs/README.md deleted file mode 100644 index cde6f223d..000000000 --- a/docs/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Remmina Documentation - -This folder must contains only development related documentation (strichtly related and useful for Remmina), and any documentation files that must be installed on the system, likeuser documentation (man, user manual). - -We are working on ( #954 ) man pages and other documentation, if you want to help out contact the development team. diff --git a/docs/Submodules.md b/docs/Submodules.md deleted file mode 100644 index d196cfdcb..000000000 --- a/docs/Submodules.md +++ /dev/null @@ -1,18 +0,0 @@ -## How to add a submodule - -``` -git submodule add https://github.com/FreeRDP/FreeRDP.git FreeRDP -cd FreeRDP -git checkout ed3d9526b2 -cd .. -git commit -am "Added submodule as ./FreeRDP" -git push -``` - -## How to clone -``` -git clone https://github.com/FreeRDP/Remmina.git Remmina -cd Remmina -git submodule init -git submodule update -```
\ No newline at end of file diff --git a/docs/Update-gettext-messages.md b/docs/Update-gettext-messages.md deleted file mode 100644 index cacea2840..000000000 --- a/docs/Update-gettext-messages.md +++ /dev/null @@ -1,25 +0,0 @@ -This is a quick, dirty and no brainy procedure to update the po files in Remmina. - -Please count till 10 seconds before to copy&paste it in the terminal. - -```bash -REMMINATOP=~/remmina_devel/Remmina -cd $REMMINATOP -find . -name "*.c" | sed 's/^.\///' >| remmina/po/POTFILES.in -find . -name "*.glade" | sed 's/^.\///' >> remmina/po/POTFILES.in -vi remmina/po/POTFILES.in #Remove unneded files, i.e. build files -xgettext --files-from=remmina/po/POTFILES.in -k_ -kN_ -ktranslatable --output=remmina/po/messages.pot -cd $REMMINATOP/remmina/po -for i in *.po; do -msgmerge -N --backup=off --update $i messages.pot -done -for i in $REMMINATOP/remmina/po/*.po ; do -TMPF=/tmp/f$$.txt -sed '/^#~/d' $i > $TMPF -awk 'BEGIN{bl=0}/^$/{bl++;if(bl==1)print;else next}/^..*$/{bl=0;print}' $TMPF >| $i -rm $TMPF -done -rm *.po~ -rm messages.pot - -`
\ No newline at end of file diff --git a/docs/wiki/Compile-Remmina-on-Arch-Linux.md b/docs/wiki/Compile-Remmina-on-Arch-Linux.md deleted file mode 100644 index a5757fb55..000000000 --- a/docs/wiki/Compile-Remmina-on-Arch-Linux.md +++ /dev/null @@ -1,101 +0,0 @@ -# Quick and dirty guide for compiling remmina on Arch - -These are the instructions for people who want to test the latest version of Remmina on Arch linux - -You will obtain Remmina compiled under the /opt/remmina_devel/ subdir, so it will not mess up your system too much. This is ideal for testing remmina. - -You will also find the uninstall instructions at the bottom of this page. - -**ChangeLog** -- Initial write: Jul 16 2015 - - -You must be **root** to follow this guide. - -**1.** Update your system and install all packages required to build freerdp and remmina: -``` -pacman -Syu -``` -and reboot if needed. - -Install packages needed for compilation: -``` -pacman -S base-devel git libssh libvncserver gnome-keyring libgnome-keyring libpulse vte3 cmake -``` -**2.** Remove installed versions of remmina and freerdp - -``` -pacman -Rs remmina freerdp -``` - -**3.** Create a new directory for development in your home directory, and cd into it -``` -mkdir ~/remmina_devel -cd ~/remmina_devel -``` - -**4.** Download the latest source code of FreeRDP from its master branch -``` -git clone https://github.com/FreeRDP/FreeRDP.git -cd FreeRDP -``` -**5.** Configure FreeRDP for compilation (don't forget to include -DWITH_PULSE=ON) -``` -cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSE2=ON -DWITH_CUPS=on -DWITH_WAYLAND=off -DWITH_PULSE=on -DCMAKE_INSTALL_PREFIX:PATH=/opt/remmina_devel/freerdp . -``` -Please note that the above line will make FreeRDP install in /opt/remmina_devel/freerdp - -**6.** Compile FreeRDP and install -``` -make && make install -``` -**7.** Make your system dynamic loader aware of the new libraries you installed. For Ubuntu x64: -``` -echo /opt/remmina_devel/freerdp/lib | sudo tee /etc/ld.so.conf.d/freerdp_devel.conf > /dev/null -sudo ldconfig -``` -Please note: on arch 64 bit systems, the above lib directory could be different (`/opt/remmina_devel/freerdp/lib64`) - -**8.** Link executable in /usr/local/bin -``` -ln -s /opt/remmina_devel/freerdp/bin/xfreerdp /usr/local/bin/ -``` -**9.** Test the new freerdp by connecting to a RDP host -``` -xfreerdp +clipboard /sound:rate:44100,channel:2 /v:hostname /u:username -``` -**10.** Now clone remmina repository, branch "next" to your devel dir: -``` -cd ~/remmina_devel -git clone https://github.com/FreeRDP/Remmina.git -b next -``` -**11.** Configure Remmina for compilation -``` -cd Remmina -cmake -DWITH_TELEPATHY=off -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/opt/remmina_devel/remmina -DWITH_APPINDICATOR=off -DCMAKE_PREFIX_PATH=/opt/remmina_devel/freerdp --build=build . -``` -**12.** Compile remmina and install it -``` -make && make install -``` -**13.** Link the executable -``` -ln -s /opt/remmina_devel/remmina/bin/remmina /usr/local/bin/ -``` -**14.** Run remmina -``` -remmina -``` -NOTES for execution: -* Icons and .desktop files are not installed, so don't search for remmina in Gnome Shell. You can only launch it from a terminal or pressing ALT-F2 and typing remmina. -* Gnome Shell will never show you the system tray icon and menu. Press Super+M to see the remmina icon on the message bar. - -## Uninstall everything -**1.** Remove the devel directory -``` -rm -rf ~/remmina_devel/ -``` -**2.** Remove the binary directory and the symlink -``` -rm -rf /opt/remmina_devel/ /usr/local/bin/remmina -``` diff --git a/docs/wiki/Compile-on-Fedora-20.md b/docs/wiki/Compile-on-Fedora-20.md deleted file mode 100644 index ffcfe3bfc..000000000 --- a/docs/wiki/Compile-on-Fedora-20.md +++ /dev/null @@ -1,120 +0,0 @@ -# Quick and dirty guide for compiling remmina on Fedora 20 - -These are the instructions for people who want to test the latest version of Remmina on Fedora 20 - -You will obtain Remmina and FreeRDP compiled under the /opt/remmina_devel/ subdir, so they will not mess up your system too much. This is ideal for testing remmina. - -You will also find the uninstall instructions at the bottom of this page. - -**ChangeLog** -- Initial write: Aug 23 2014. -- Updated: Aug 30 2014 (compile with libappindicator) -- Updated: Sep 2 2014 (notes for Gnome Shell Users) -- Update: Oct 3 2014 (change from branch "gtk3" to "next") -- Update Oct 15 2014: addedd -DWITH_CUPS=on -DWITH_WAYLAND=off to freerdp parameters - -*UNTESTED*: use at your own risk - -**1.** Update your system and install all packages required to build freerdp and remmina: -``` -sudo yum -y update -``` -and reboot if needed. Then install packages for freerdp -``` -sudo yum install gcc gcc-c++ cmake openssl-devel libX11-devel libXext-devel \ - libXinerama-devel libXcursor-devel \ - libXdamage-devel libXv-devel libxkbfile-devel alsa-lib-devel cups-devel ffmpeg-devel glib2-devel \ - pulseaudio-libs-devel git libssh-devel libXi-devel libXtst-devel xmlto gstreamer1-devel \ - libXrandr-devel gstreamer1-plugins-base-devel -``` -and then install packages for remmina -``` -sudo yum install gtk3-devel libgcrypt-devel libssh-devel libxkbfile-devel openjpeg2-devel \ - gnutls-devel libgnome-keyring-devel avahi-ui-devel avahi-ui-gtk3 \ - libvncserver-devel vte3-devel libappindicator-devel libappindicator-gtk3 libappindicator-gtk3-devel \ - telepathy-glib-devel libSM-devel webkitgtk4-devel -``` -**2.** Remove freerdp-x11 package and all packages containing the string remmina in the package name. - -``` -sudo rpm -e remmina remmina-devel remmina-plugins-gnome remmina-plugins-nx remmina-plugins-rdp remmina-plugins-telepathy remmina-plugins-vnc remmina-plugins-xdmcp -``` - -**3.** Create a new directory for development in your home directory, and cd into it -``` -mkdir ~/remmina_devel -cd ~/remmina_devel -``` -**4.** Download the latest source code of FreeRDP from its master branch -``` -git clone https://github.com/FreeRDP/FreeRDP.git -cd FreeRDP -``` -**5.** Configure FreeRDP for compilation (don't forget to include -DWITH_PULSE=ON) -``` -cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSE2=ON -DWITH_PULSE=ON -DWITH_CUPS=on -DWITH_WAYLAND=off -DCMAKE_INSTALL_PREFIX:PATH=/opt/remmina_devel/freerdp . -``` -Please note that the above line will make FreeRDP install in /opt/remmina_devel/freerdp - -**6.** Compile FreeRDP and install -``` -make && sudo make install -``` -**7.** Make your system dynamic loader aware of the new libraries you installed. For Fedora x64: -``` -echo /opt/remmina_devel/freerdp/lib64/ | sudo tee /etc/ld.so.conf.d/freerdp_devel.conf > /dev/null -sudo ldconfig -``` -For fedora 32 bit (i686) you have to change the path of the source lib folder in the first line. - -**8.** Link executable in /usr/local/bin -``` -sudo ln -s /opt/remmina_devel/freerdp/bin/xfreerdp /usr/local/bin/ -``` -**9.** Test the new freerdp by connecting to a RDP host -``` -xfreerdp +clipboard /sound:rate:44100,channel:2 /v:hostname /u:username -``` - -**10.** Now clone remmina repository, branch "next" to your devel dir: -``` -cd ~/remmina_devel -git clone https://github.com/FreeRDP/Remmina.git -b next -``` - -**11.** Configure Remmina for compilation -``` -cd Remmina -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/opt/remmina_devel/remmina -DCMAKE_PREFIX_PATH=/opt/remmina_devel/freerdp --build=build . -``` -**12.** Compile remmina and install it -``` -make && sudo make install -``` -**13.** Link the executable -``` -sudo ln -s /opt/remmina_devel/remmina/bin/remmina /usr/local/bin/ -``` -**14.** Run remmina -``` -remmina -``` -NOTES for execution: -* Icons and .desktop files are not installed, so don't search for remmina in Gnome Shell. You can only launch it from a terminal or pressing ALT-F2 and typing remmina. -* Gnome Shell will never show you the system tray icon and menu. Press Super+M to see the remmina icon on the message bar. Or install this extension to have full access to a remmina appindicator icon: [Appindicator Support Gnome Shell Extension](https://extensions.gnome.org/extension/615/appindicator-support/) -* XFCE and other desktop without appindicator support, will never show you the system tray icon if you are executing remmina from its compilation direcotry (~/remmina_devel/Remmina) because it contains a directory named remmina. See [Bug #1363277 on launchpad](https://bugs.launchpad.net/libappindicator/+bug/1363277) - -## Uninstall everything -**1.** Remove the devel directory -``` -rm -rf ~/remmina_devel/ -``` -**2.** Remove the binary directory -``` -sudo rm -rf /opt/remmina_devel/ -``` -**3.** Cleanup symlinks and dynamic loader -``` -sudo rm /etc/ld.so.conf.d/freerdp_devel.conf /usr/local/bin/remmina /usr/local/bin/xfreerdp -sudo ldconfig -``` diff --git a/docs/wiki/Compile-on-Ubuntu-14.04-and-14.10.asciidoc b/docs/wiki/Compile-on-Ubuntu-14.04-and-14.10.asciidoc deleted file mode 100644 index 839b294f3..000000000 --- a/docs/wiki/Compile-on-Ubuntu-14.04-and-14.10.asciidoc +++ /dev/null @@ -1 +0,0 @@ -GOTO https://github.com/FreeRDP/Remmina/wiki/Compile-on-Ubuntu-14.04
\ No newline at end of file diff --git a/docs/wiki/Compile-on-Ubuntu-14.04.md b/docs/wiki/Compile-on-Ubuntu-14.04.md deleted file mode 100644 index f4cd2e914..000000000 --- a/docs/wiki/Compile-on-Ubuntu-14.04.md +++ /dev/null @@ -1,120 +0,0 @@ -# Quick and dirty guide for compiling remmina on ubuntu 14.04
-
-These are instructions for people or software developers who want to contribute to the latest version of Remmina on Ubuntu 14.04.
-
-If you are an end user and you want to install the latest version of remmina, please use the "Remmina Team Ubuntu PPA - next branch", as explained on the [homepage of the wiki](Home.md).
-
-By following these instructions, you will get Remmina and FreeRDP compiled under the /opt/remmina_devel/ subdir, so they will not mess up your system too much. This is ideal for testing remmina.
-
-You will also find the uninstall instructions at the bottom of this page.
-
-**Changelog**
-* Initial write: Aug 20 2014.
-* Update Oct 3 2014: changed branch name from gtk3 to next
-* Update Oct 15 2014: addedd -DWITH_CUPS=on -DWITH_WAYLAND=off to freerdp parameters
-* Update Oct 23 2014: tested on ubuntu 14.10
-* Update Oct 29 2014: tested on Mine 17.2 (based on Ubuntu 14.04)
-* Update Oct 29 2015: Found a load of install issued on step 1, changed recommendation from apt-get to aptitude as it reports issues far more lucidly and they all boil down to my having later versions of packages these depend on.
-* Update Nov 23 2015: Added libsecret-1-dev to packages to be installed
-* Update Jan 16 2016: Added libsystemd-dev
-* Update Jan 23 2016: Added libwebkit2gtk-3.0-dev
-* Update Mar 12 2016: Added apt-get remove of some freerdp packages installed from the PPA, removed ubuntu 14.10
-
-**1.** Install all packages required to build freerdp and remmina:
-```
-sudo aptitude install build-essential git-core cmake libssl-dev libx11-dev libxext-dev libxinerama-dev \
- libxcursor-dev libxdamage-dev libxv-dev libxkbfile-dev libasound2-dev libcups2-dev libxml2 libxml2-dev \
- libxrandr-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev \
- libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libxi-dev libavutil-dev \
- libavcodec-dev libxtst-dev libgtk-3-dev libgcrypt11-dev libssh-dev libpulse-dev \
- libvte-2.90-dev libxkbfile-dev libfreerdp-dev libtelepathy-glib-dev libjpeg-dev \
- libgnutls-dev libgnome-keyring-dev libavahi-ui-gtk3-dev libvncserver-dev \
- libappindicator3-dev intltool libsecret-1-dev libwebkit2gtk-3.0-dev
-```
-And try also to install libsystemd-dev (available only in newer ubuntu)
-```
-sudo aptitude install libsystemd-dev
-```
-**2.** Remove freerdp-x11 package and all packages containing the string remmina in the package name.
-```
-sudo apt-get --purge remove freerdp-x11 \
- remmina remmina-common remmina-plugin-rdp remmina-plugin-vnc remmina-plugin-gnome \
- remmina-plugin-nx remmina-plugin-telepathy remmina-plugin-xdmcp
-sudo apt-get --purge remove libfreerdp-dev libfreerdp-plugins-standard libfreerdp1
-```
-
-**3.** Create a new directory for development in your home directory, and cd into it
-```
-mkdir ~/remmina_devel
-cd ~/remmina_devel
-```
-**4.** Download the latest source code of FreeRDP from its master branch
-```
-git clone https://github.com/FreeRDP/FreeRDP.git
-cd FreeRDP
-```
-**5.** Configure FreeRDP for compilation (don't forget to include -DWITH_PULSE=ON)
-```
-cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSE2=ON -DWITH_CUPS=on -DWITH_WAYLAND=off -DWITH_PULSE=on -DCMAKE_INSTALL_PREFIX:PATH=/opt/remmina_devel/freerdp .
-```
-Please note that the above line will make FreeRDP install in /opt/remmina_devel/freerdp
-
-**6.** Compile FreeRDP and install
-```
-make && sudo make install
-```
-**7.** Make your system dynamic loader aware of the new libraries you installed. For Ubuntu x64:
-```
-echo /opt/remmina_devel/freerdp/lib | sudo tee /etc/ld.so.conf.d/freerdp_devel.conf > /dev/null
-sudo ldconfig
-```
-For ubuntu 32 bit you have to change the path of the source lib folder in the first line.
-
-**8.** Link executable in /usr/local/bin
-```
-sudo ln -s /opt/remmina_devel/freerdp/bin/xfreerdp /usr/local/bin/
-```
-**9.** Test the new freerdp by connecting to a RDP host
-```
-xfreerdp +clipboard /sound:rate:44100,channel:2 /v:hostname /u:username
-```
-
-**10.** Now clone remmina repository, "next" branch, to your devel dir:
-```
-cd ~/remmina_devel
-git clone https://github.com/FreeRDP/Remmina.git -b next
-```
-
-**11.** Configure Remmina for compilation
-```
-cd Remmina
-cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/opt/remmina_devel/remmina -DCMAKE_PREFIX_PATH=/opt/remmina_devel/freerdp --build=build .
-```
-**12.** Compile remmina and install it
-```
-make && sudo make install
-```
-**13.** Link the executable
-```
-sudo ln -s /opt/remmina_devel/remmina/bin/remmina /usr/local/bin/
-```
-**14.** Run remmina
-```
-remmina
-```
-Please note that icons and launcher files are not installed, so don't search for remmina using Unity Dash.
-
-## Uninstall everything
-**1.** Remove the devel directory
-```
-rm -rf ~/remmina_devel/
-```
-**2.** Remove the binary directory
-```
-sudo rm -rf /opt/remmina_devel/
-```
-**3.** Cleanup symlinks and dynamic loader
-```
-sudo rm /etc/ld.so.conf.d/freerdp_devel.conf /usr/local/bin/remmina /usr/local/bin/xfreerdp
-sudo ldconfig
-```
diff --git a/docs/wiki/Compile-on-Ubuntu-16.04.md b/docs/wiki/Compile-on-Ubuntu-16.04.md deleted file mode 100644 index 17ca89aa8..000000000 --- a/docs/wiki/Compile-on-Ubuntu-16.04.md +++ /dev/null @@ -1,118 +0,0 @@ -# Quick and dirty guide for compiling remmina on ubuntu 16.04 - -These are instructions for people or software developers who want to contribute to the latest version of Remmina on Ubuntu 16.04. - -If you are an end user and you want to install the latest version of remmina, please use the "Remmina Team Ubuntu PPA - next branch", as explained on the [homepage of the wiki](Home.md). - -By following these instructions, you will get Remmina and FreeRDP compiled under the /opt/remmina_devel/ subdir, so they will not mess up your system too much. This is ideal for testing remmina. - -You will also find the uninstall instructions at the bottom of this page. - -**Changelog** -* Initial write: Mar 30 2016. -* Apr 19 2016: added apt-get remove for libwinpr and other packages - -**1.** Install all packages required to build freerdp and remmina: -``` -sudo apt-get install build-essential git-core cmake libssl-dev libx11-dev libxext-dev libxinerama-dev \ - libxcursor-dev libxdamage-dev libxv-dev libxkbfile-dev libasound2-dev libcups2-dev libxml2 libxml2-dev \ - libxrandr-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev \ - libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libxi-dev libavutil-dev \ - libavcodec-dev libxtst-dev libgtk-3-dev libgcrypt11-dev libssh-dev libpulse-dev \ - libvte-2.91-dev libxkbfile-dev libtelepathy-glib-dev libjpeg-dev \ - libgnutls-dev libgnome-keyring-dev libavahi-ui-gtk3-dev libvncserver-dev \ - libappindicator3-dev intltool libsecret-1-dev libwebkit2gtk-4.0-dev libsystemd-dev -``` -**2.** Remove freerdp-x11 package and all packages containing the string remmina in the package name. -``` -sudo apt-get --purge remove freerdp-x11 \ - remmina remmina-common remmina-plugin-rdp remmina-plugin-vnc remmina-plugin-gnome \ - remmina-plugin-nx remmina-plugin-telepathy remmina-plugin-xdmcp -sudo apt-get --purge remove libfreerdp-dev libfreerdp-plugins-standard libfreerdp1 \ - libfreerdp-utils1.1 libfreerdp-primitives1.1 libfreerdp-locale1.1 \ - libfreerdp-gdi1.1 libfreerdp-crypto1.1 libfreerdp-core1.1 libfreerdp-common1.1.0 \ - libfreerdp-codec1.1 libfreerdp-client1.1 libfreerdp-cache1.1 -sudo apt-get --purge remove \ - libfreerdp-rail1.1 libwinpr-asn1-0.1 libwinpr-bcrypt0.1 libwinpr-credentials0.1 libwinpr-credui0.1 \ - libwinpr-crt0.1 libwinpr-crypto0.1 libwinpr-dev libwinpr-dsparse0.1 libwinpr-environment0.1 \ - libwinpr-error0.1 libwinpr-file0.1 libwinpr-handle0.1 libwinpr-heap0.1 libwinpr-input0.1 \ - libwinpr-interlocked0.1 libwinpr-io0.1 libwinpr-library0.1 libwinpr-path0.1 libwinpr-pipe0.1 \ - libwinpr-pool0.1 libwinpr-registry0.1 libwinpr-rpc0.1 libwinpr-sspi0.1 libwinpr-sspicli0.1 \ - libwinpr-synch0.1 libwinpr-sysinfo0.1 libwinpr-thread0.1 libwinpr-timezone0.1 libwinpr-utils0.1 \ - libwinpr-winhttp0.1 libwinpr-winsock0.1 -``` - -**3.** Create a new directory for development in your home directory, and cd into it -``` -mkdir ~/remmina_devel -cd ~/remmina_devel -``` -**4.** Download the latest source code of FreeRDP from its master branch -``` -git clone https://github.com/FreeRDP/FreeRDP.git -cd FreeRDP -``` -**5.** Configure FreeRDP for compilation (don't forget to include -DWITH_PULSE=ON) -``` -cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSE2=ON -DWITH_CUPS=on -DWITH_WAYLAND=off -DWITH_PULSE=on -DCMAKE_INSTALL_PREFIX:PATH=/opt/remmina_devel/freerdp . -``` -Please note that the above line will make FreeRDP install in /opt/remmina_devel/freerdp - -**6.** Compile FreeRDP and install -``` -make && sudo make install -``` -**7.** Make your system dynamic loader aware of the new libraries you installed. For Ubuntu x64: -``` -echo /opt/remmina_devel/freerdp/lib | sudo tee /etc/ld.so.conf.d/freerdp_devel.conf > /dev/null -sudo ldconfig -``` - -**8.** Create a symbolik link to the executable in /usr/local/bin -``` -sudo ln -s /opt/remmina_devel/freerdp/bin/xfreerdp /usr/local/bin/ -``` -**9.** Test the new freerdp by connecting to a RDP host -``` -xfreerdp +clipboard /sound:rate:44100,channel:2 /v:hostname /u:username -``` - -**10.** Now clone remmina repository, "next" branch, to your devel dir: -``` -cd ~/remmina_devel -git clone https://github.com/FreeRDP/Remmina.git -b next -``` - -**11.** Configure Remmina for compilation -``` -cd Remmina -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/opt/remmina_devel/remmina -DCMAKE_PREFIX_PATH=/opt/remmina_devel/freerdp --build=build . -``` -**12.** Compile remmina and install it -``` -make && sudo make install -``` -**13.** Create a symbolik link to the the executable -``` -sudo ln -s /opt/remmina_devel/remmina/bin/remmina /usr/local/bin/ -``` -**14.** Run remmina -``` -remmina -``` -Please note that icons and launcher files are not installed, so don't search for remmina using Unity Dash. - -## Uninstall everything -**1.** Remove the devel directory -``` -rm -rf ~/remmina_devel/ -``` -**2.** Remove the binary directory -``` -sudo rm -rf /opt/remmina_devel/ -``` -**3.** Cleanup symlinks and dynamic loader -``` -sudo rm /etc/ld.so.conf.d/freerdp_devel.conf /usr/local/bin/remmina /usr/local/bin/xfreerdp -sudo ldconfig -``` diff --git a/docs/wiki/GTK-versions-on-various-distributions.md b/docs/wiki/GTK-versions-on-various-distributions.md deleted file mode 100644 index abbe436da..000000000 --- a/docs/wiki/GTK-versions-on-various-distributions.md +++ /dev/null @@ -1,48 +0,0 @@ - -Distribution|GTK+3 version|libssh version|libvncserver version| ----|---:|---:|---: -Debian 7 Wheezy (current Raspbian)|[3.4.2][gtk-wheezy]|[0.5.4][ssh-wheezy]|[0.9.9][vnc-wheezy] -Debian 8 Jessie|[3.14.5][gtk-jessie]|[0.6.3][ssh-jessie]|[0.9.9][vnc-jessie] -Debian Sid|[3.18.8][gtk-sid]|[0.6.3][ssh-sid]|[0.9.9][vnc-sid] -CentOS 7/RHEL 7|3.8|0.6.4|0.9.9 -Fedora 22|[3.16][gtk-fedora]|[0.7.3][ssh-fedora]|[0.9.10][vnc-fedora] -Fedora 23|[3.18][gtk-fedora]|[0.7.3][ssh-fedora]|[0.9.10][vnc-fedora] -Fedora 24|[3.20][gtk-fedora]|[0.7.3][ssh-fedora]|[0.9.10][vnc-fedora] -Ubuntu 10.04 LTS (Lucid Lynx)|-|[0.4.2][ssh-lucid]|[0.9.7][vnc-lucid] -Ubuntu 12.04 LTS (Precise Pangolin)|[3.4.2][gtk-precise]|[0.5.2][ssh-precise]|[0.9.8.2][vnc-precise] -Ubuntu 14.04 LTS (Trusty Tahr)|[3.10.8][gtk-trusty]|[0.6.1][ssh-trusty]|[0.9.9][vnc-trusty] -Ubuntu 14.10 (Utopic Unicorn)|[3.12.2][gtk-utopic]|[0.6.3][ssh-utopic]|[0.9.9][vnc-utopic] -Ubuntu 15.04 (Vivid Vervet)|[3.14.7][gtk-vivid]|[0.6.3][ssh-vivid]|[0.9.9][vnc-vivid] -Arch Linux|[3.14.8][gtk-arch]|[0.6.4][ssh-arch]|[0.9.10][vnc-arch] - -[gtk-wheezy]: https://packages.debian.org/wheezy/libgtk-3-0 -[gtk-jessie]: https://packages.debian.org/jessie/libgtk-3-0 -[gtk-sid]: https://packages.debian.org/sid/libgtk-3-0 -[gtk-precise]: http://packages.ubuntu.com/precise-updates/libgtk-3-0 -[gtk-trusty]: http://packages.ubuntu.com/trusty-updates/libgtk-3-0 -[gtk-utopic]: http://packages.ubuntu.com/utopic-updates/libgtk-3-0 -[gtk-vivid]: http://packages.ubuntu.com/vivid/libgtk-3-0 -[gtk-arch]: https://www.archlinux.org/packages/extra/i686/gtk3/ -[gtk-fedora]: https://apps.fedoraproject.org/packages/gtk3 - -[ssh-wheezy]: https://packages.debian.org/wheezy/libssh-4 -[ssh-jessie]: https://packages.debian.org/jessie/libssh-4 -[ssh-sid]: https://packages.debian.org/sid/libssh-4 -[ssh-lucid]: http://packages.ubuntu.com/lucid-updates/libssh-4 -[ssh-precise]: http://packages.ubuntu.com/precise-updates/libssh-4 -[ssh-trusty]: http://packages.ubuntu.com/trusty-updates/libssh-4 -[ssh-utopic]: http://packages.ubuntu.com/utopic-updates/libssh-4 -[ssh-vivid]: http://packages.ubuntu.com/vivid/libssh-4 -[ssh-arch]: https://www.archlinux.org/packages/extra/i686/libssh/ -[ssh-fedora]: https://apps.fedoraproject.org/packages/libssh - -[vnc-wheezy]: https://packages.debian.org/wheezy/libvncserver0 -[vnc-jessie]: https://packages.debian.org/jessie/libvncserver0 -[vnc-sid]: https://packages.debian.org/sid/libvncserver0 -[vnc-lucid]: http://packages.ubuntu.com/lucid/libvncserver0 -[vnc-precise]: http://packages.ubuntu.com/precise-updates/libvncserver0 -[vnc-trusty]: http://packages.ubuntu.com/trusty-updates/libvncserver0 -[vnc-utopic]: http://packages.ubuntu.com/utopic/libvncserver0 -[vnc-vivid]: http://packages.ubuntu.com/vivid/libvncserver0 -[vnc-arch]: https://www.archlinux.org/packages/extra/i686/libvncserver/ -[vnc-fedora]: https://apps.fedoraproject.org/packages/libvncserver
\ No newline at end of file diff --git a/docs/wiki/Home.md b/docs/wiki/Home.md deleted file mode 100644 index deb4a8965..000000000 --- a/docs/wiki/Home.md +++ /dev/null @@ -1,39 +0,0 @@ -Welcome to the Remmina wiki!
-
-## FOR END USERS ##
-Usually remmina is included in your linux distribution or in an external repository. Do not ask for distribution packages or precompiled binaries here. This is a development site.
-
-### For Ubuntu users we have an official PPA with Remmina 1.2 ###
-https://launchpad.net/~remmina-ppa-team/+archive/ubuntu/remmina-next
-
-To install it, just copy and paste the following three lines on a terminal window
-```
-sudo apt-add-repository ppa:remmina-ppa-team/remmina-next
-sudo apt-get update
-sudo apt-get install remmina remmina-plugin-rdp libfreerdp-plugins-standard
-```
-Don't forget to exit/kill al your running instances of remmina. The best way to do it is to **reboot** your PC. Or, if you cannot reboot, kill all running remmina with
-```
-sudo killall remmina
-```
-By default the RDP, SSH and SFTP plugins are installed. You can view a list of available plugins with `apt-cache search remmina-plugin`
-
-## FOR DEVELOPERS, PACKAGERS AND TESTERS ##
-### CURRENT STATUS ###
-
-Here, on github, we have three official branches:
-
-"next" branch: the future 1.2.0 version, which compiles with current freerdp master branch and will compile with freerdp 2.0 when released. We will do code developments and bugfixes here, on the next branch.
-
-"master" branch: the 1.1.2 stable version, which compiles with freerdp 1.1 stable. We will only provide security fixes or critical bugs (i.e.: data corruption) fixes on version 1.1.X.
-
-"gtk2" branch: a special remmina 1.1.1 version compatible with GTK2, compiles with freerdp 1.1 stable
-
-### REMMINA COMPILATION GUIDES ###
-
-* How to compile "next" branch on [Ubuntu 14.04](Compile-on-Ubuntu-14.04.md) and [Ubuntu 16.04](Compile-on-Ubuntu-16.04.md).
-* How to compile "next" branch on [Fedora 20](Compile-on-Fedora-20.md).
-* For Debian 7.6 you can use the Ubuntu guide, but you must disable SSH with -DWITH_LIBSSH=OFF when executing cmake. libssh provided with debian 7 (v 5.4) is older than the needed version 6.x.
-
-### Links ###
-We also have a website: http://www.remmina.org
diff --git a/docs/wiki/How-to-compile-Remmina-on-FreeBSD.md b/docs/wiki/How-to-compile-Remmina-on-FreeBSD.md deleted file mode 100644 index 9f23cd00f..000000000 --- a/docs/wiki/How-to-compile-Remmina-on-FreeBSD.md +++ /dev/null @@ -1,80 +0,0 @@ -# Remmina dependencies. - -In order to use Remmina, you need at least one plugin, here we explain you how to build Remmina with most plugins but mainly with FreerDP support. - -## How to compile FreeRDP - -Follow the next procedure to install FreerDPP - -### Install FreeRDP dependencies - -```sh -pkg install cmake cmake-modules gccmakedep git pkgconf libX11 libXext libXinerama libXcursor libXdamage libXv libxkbfile alsa-lib cups ffmpeg pulseaudio libssh libXi libXtst libXrandr xmlto gstreamer1 gstreamer1-plugins -``` -### Get FreeRDP code in you development environment -**1.** Prepare your dev environment -``` -mkdir ~/remmina_devel -cd ~/remmina_devel -``` -**2.** Get the source code -``` -git clone https://github.com/FreeRDP/FreeRDP.git -cd FreeRDP -``` -**3.** Configure FreeRDP -``` -cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSE2=ON -DWITH_PULSE=ON -DWITH_CUPS=on -DWITH_WAYLAND=off -DCMAKE_INSTALL_PREFIX:PATH=/opt/remmina_devel/freerdp . -``` -**4.** Compile and install - -``` -make && sudo make install -``` -**5.** Add the freerdp library path to ldconfig -Edit the file `/etc/ld-elf.so.conf`, create it if it does not exits. A add the line -``` -/opt/remmina_devel/freerdp/lib/ -``` -And then restart ldconfig with -``` -service ldconfig restart -``` -**6.** Link the xfreerdp executable - -If you use Gnome, you probably have FreerDP installed under /usr/local. Gnome needs vinagre that needs FreerDP, so you won't be able to remove FreeRDP, that shouldn't be an issue as we installed the git version under /opt... But keep this in mind if you'll have troubles. -If you don't have Gnome, you can link xfreerdp under /usr/local/bin -``` -sudo ln -s /opt/remmina_devel/freerdp/bin/xfreerdp /usr/local/bin/ -``` -**7.** Test xfreerdp -``` -xfreerdp +clipboard /sound:rate:44100,channel:2 /v:hostname /u:username -``` -## How to compile Remmina -**1.** Install Remmina dependencies. -``` -pkg install avahi-gtk3 gtk3 libgcrypt webkit2-gtk3 webkit-gtk3 gnutls avahi vte3-290 vte3 telepathy-glib libSM openjpeg libvncserver -``` -**2.** Install gnome keyring or similar password storage for your specific desktop -``` -pkg install gnome-keyring -``` -**3.** Clone Remmina -``` -cd ~/remmina_devel -git clone https://github.com/FreeRDP/Remmina.git -b next -``` -**4.** Configure compile settings -``` -cd Remmina -cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_APPINDICATOR=OFF -DCMAKE_INSTALL_PREFIX:PATH=/opt/remmina_devel/remmina -DCMAKE_PREFIX_PATH=/opt/remmina_devel/freerdp --build=build . -``` -**5.** Compile remmina and install it -``` -make && make install -``` -**6.** Run Remmina -``` -/opt/remmina_devel/remmina/bin/remmina -``` diff --git a/docs/wiki/README.md b/docs/wiki/README.md deleted file mode 100644 index 4f41b0a64..000000000 --- a/docs/wiki/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Wiki consolidation - -We are trying to consolidate the wiki articles directhly in the remmina source code. - -At the moment don't edit these file except if you're going to update the original wiki files. - -We are working on something that will keep in sync the wiki and these files ( #951 ) - diff --git a/docs/wiki/Remmina-Usage-FAQ.md b/docs/wiki/Remmina-Usage-FAQ.md deleted file mode 100644 index a92e0d4fb..000000000 --- a/docs/wiki/Remmina-Usage-FAQ.md +++ /dev/null @@ -1,28 +0,0 @@ -# Remmina Usage FAQ - -1. **Where are all my connections and preferences stored ?** -**A:** Remmina stores its configuration file in directories identified according the [XDG Base Directory Specification](http://www.freedesktop.org/Standards/basedir-spec). -A main configuration file `remmina.pref` is stored into `$XDG_CONFIG_HOME/remmina/` directory, which defaults to `$HOME/.config/remmina/`. -Every single connection profile is stored into a `XXXXXXXXXXXXX.remmina` file under `$XDG_DATA_HOME/remmina` directory, which defaults to `$HOME/.local/share/remmina`. -Older versions of remmina used to store all `*.remmina` and `remmina.pref` files under `$HOME/.remmina`. If a newer version of remmina finds an existing `$HOME/remmina/` legacy directory, then remmina will revert back to use it. - -2. **Can I start a connection using a shell command ?** -**A:** Yes, use `remmina -c filename`. - -3. **When I'm in fullscreen mode, I cannot see the "floating toolbar" (the bar at the top of the screen), or I can see part of it but it does not scroll down or receive my input.** -**A:** You are using Gnome Shell and an older version of remmina. This has been fixed under remmina 1.2.0-rcgit.3 compiled with GTK+ 3.10 or newer. Please restart your system after upgrading remmina. - -4. **The "Quality settings" in Remmina preferences -> RDP is not saving the default quality setting.** -**A:** This is a quality profile editor, not a quality chooser. See issue #521 - -5. **I'm unable to escape from VMware vSphere client console pressing Ctrl+Alt.** -**A:** You are probably pushing the Ctrl key on the right side of the keyboard. That key is reserved as Remmina Host key. Use the left Ctrl key or change the host key in the Remmina global settings. - -6. **Under Gnome Shell the Remmina systray menu is hidden in the hidden notification area** -**A:** Install this [AppIndicator Support Gnome Shell Extension](https://extensions.gnome.org/extension/615/appindicator-support/) to see the systray menu in a more confortable place. - -7. **After a Remmina upgrade, I'm unable to connect to some servers.** -**A:** Try to remove the file `~/.config/freerdp/known_hosts`. - -8. **After a Remmina upgrade, I have to reenter all passwords.** -**A:** Yes, with commit 57ec85d8e9bf773b8a08c17a0218b6cd643c828b we switched to libsecret, and passwords cannot be imported automatically. diff --git a/docs/wiki/Remmina-User's-guide.md b/docs/wiki/Remmina-User's-guide.md deleted file mode 100644 index 55fc66ea2..000000000 --- a/docs/wiki/Remmina-User's-guide.md +++ /dev/null @@ -1,41 +0,0 @@ -# Introduction - -This manual is a work in progress. Feel free to contribute and help us to make this manual useful and pleasant to read. - -Screen shots are taken and modified with [Shutter](http://shutter-project.org) - -# Remmina Introduction - -Remmina is a feature rich Remote Desktop Application for GNU Linux(tm) and FreeBSD and possibly other Unixes. - -## Remmina features - -- Maintain a list of connection profiles, organized by groups -- Make quick connections by directly putting in the server address -- Remote desktops with higher resolutions are scrollable/scalable in both window and fullscreen mode. -- Viewport fullscreen mode: remote desktop automatically scrolls when the mouse moves over the screen edge. -- Floating toolbar in fullscreen mode, allows you to switch between modes, toggle keyboard grabbing, minimize, etc. -- Tabbed interface, optionally managed by groups. -- Tray icon, allows you to quickly access configured connection profiles -- Remote screen-shots - - - -## How to use Remmina -The following are typical use cases -### Quick connect using RDP -Use this if you don't need or want to save your connection. -Only RDP, SSH, VNC and NX are supported in the quick connect. - -1. Choose the protocol -2. Insert the sarver name -3. Click on connect -### Create a new Profile -1. Click on the "New Profile" icon - -2. Enter your server connection details - - -- You can ask Remmina to execute commands before and after the connection -- If you use Avahi, you can search available hosts as highlighted -- You can group different connections.
\ No newline at end of file diff --git a/docs/wiki/Systray-menu.md b/docs/wiki/Systray-menu.md deleted file mode 100644 index dfaf82033..000000000 --- a/docs/wiki/Systray-menu.md +++ /dev/null @@ -1,49 +0,0 @@ -# Systray menu -Currently there is not a common way to create a systray menu compatible with all desktops. - -[GtkStatusIcon](https://developer.gnome.org/gtk3/stable/GtkStatusIcon.html) has been deprecated since GTK 3.14. -So we must move to something else. Unfortunately, this "something else" is different from a desktop environment to another. - -E.g.: read [this discussion](https://trac.transmissionbt.com/ticket/3685) for the same problem on Transmission client. - -Yet, we cannot use gtk_window_present() from a systray menu, see [issue #542](https://github.com/FreeRDP/Remmina/issues/542). - -So, for each supported desktop environment, we must answer two questions: - -Q1. Where do we put the remmina systray menu, and which API do we use for it ? -Q2. Does this place also allow the user to raise a hidden window via gtk_window_present() ? - -### References - -* [freedesktop.org system tray spec](http://www.freedesktop.org/wiki/Specifications/systemtray-spec/) -* [Libunity source code](http://bazaar.launchpad.net/~unity-team/libunity/trunk/files), written in vala. - -# The desktop environments - -### Unity -In Ubuntu's Unity, we currently do not use GtkStatusIcon, but libappindicator. This almost works, but when the remmina windows are not on the top, we are unable to present its windows to users. This is explained in [issue #542](https://github.com/FreeRDP/Remmina/issues/542) and it's a problem of the window manager which prevents gtk_window_present() to stealing focus to other applications. -We could use DBusMenu and the [Launcher API](https://wiki.ubuntu.com/Unity/LauncherAPI) to move all the current remmina systray menu into Unity Launcher icon as **dynamic quicklist entries**. -Compatibility with gtk_window_present() must be tested. - -### Gnome Shell -Some functions of the [Shell](https://developer.gnome.org/shell/stable/) for ShellTrayIcon object should help for the icon (but no menu support ???). For correctly placing a menu, we can take a look to [Gnome Shell Extension Appindicator source code](https://github.com/rgcjonas/gnome-shell-extension-appindicator). - -Currently Remmina detects Gnome Shell and, if detected, no Systray Menu will be used. We did this because Gnome Shells hides all deprecated GtkStatusIcons in a hidden place below the screen, and the user is unable to undestand when remmina is running. - -### KDE -In KDE [KStatusNotifierItem](http://api.kde.org/frameworks-api/frameworks5-apidocs/knotifications/html/classKStatusNotifierItem.html) - -### XFCE -In XFCE ??? - -### LXDE/LXQT -In LXDE ??? - -### MATE -In MATE ??? - -### EXTERNAL SOURCES ### - -* [Proper implementation of system tray icons via libappindicator/StatusNotifierItem](https://code.google.com/p/chromium/issues/detail?id=419673) -* [Updated Tray to use libappindicator in Linux](https://github.com/nwjs/nw.js/pull/2327) Discussion that propose the same Google Chrome fix. - diff --git a/docs/wiki/_config.yml b/docs/wiki/_config.yml deleted file mode 100644 index 43df70176..000000000 --- a/docs/wiki/_config.yml +++ /dev/null @@ -1,2 +0,0 @@ -gems: - - jekyll-sitemap diff --git a/remmina-plugins-gnome/CMakeLists.txt b/remmina-plugins-gnome/CMakeLists.txt index 409e6bfe4..f4c4a3f8b 100644 --- a/remmina-plugins-gnome/CMakeLists.txt +++ b/remmina-plugins-gnome/CMakeLists.txt @@ -1,6 +1,7 @@ # remmina-plugins-gnome - The GTK+ Remote Desktop Client # # Copyright (C) 2011 Marc-Andre Moreau +# Copyright (C) 2014-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina-plugins/CMakeLists.txt b/remmina-plugins/CMakeLists.txt index 945755983..cddcfda11 100644 --- a/remmina-plugins/CMakeLists.txt +++ b/remmina-plugins/CMakeLists.txt @@ -2,6 +2,7 @@ # # Copyright (C) 2011 Marc-Andre Moreau # Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo +# Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina-plugins/common/remmina_plugin.h b/remmina-plugins/common/remmina_plugin.h index bb6762f41..f8ca9719b 100644 --- a/remmina-plugins/common/remmina_plugin.h +++ b/remmina-plugins/common/remmina_plugin.h @@ -1,7 +1,8 @@ /* * Remmina - The GTK+ Remote Desktop Client - * Copyright (C) 2010 Vic Lee + * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -15,7 +16,7 @@ * * 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, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. * * In addition, as a special exception, the copyright holders give diff --git a/remmina-plugins/nx/CMakeLists.txt b/remmina-plugins/nx/CMakeLists.txt index b12caaaeb..c383fbfad 100644 --- a/remmina-plugins/nx/CMakeLists.txt +++ b/remmina-plugins/nx/CMakeLists.txt @@ -1,6 +1,7 @@ # remmina-plugin-nx - The GTK+ Remote Desktop Client # # Copyright (C) 2011 Marc-Andre Moreau +# Copyright (C) 2014-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina-plugins/nx/nx_plugin.c b/remmina-plugins/nx/nx_plugin.c index 24d91b68c..f1ed4a31d 100644 --- a/remmina-plugins/nx/nx_plugin.c +++ b/remmina-plugins/nx/nx_plugin.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/nx/nx_plugin.h b/remmina-plugins/nx/nx_plugin.h index 9e792b528..67e4a1955 100644 --- a/remmina-plugins/nx/nx_plugin.h +++ b/remmina-plugins/nx/nx_plugin.h @@ -1,7 +1,8 @@ /* * Remmina - The GTK+ Remote Desktop Client - * Copyright (C) 2010 Vic Lee + * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -15,7 +16,7 @@ * * 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, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. * * In addition, as a special exception, the copyright holders give diff --git a/remmina-plugins/nx/nx_session.c b/remmina-plugins/nx/nx_session.c index 2602e2849..03f6b4613 100644 --- a/remmina-plugins/nx/nx_session.c +++ b/remmina-plugins/nx/nx_session.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/nx/nx_session_manager.c b/remmina-plugins/nx/nx_session_manager.c index cd2c1dc43..ce7ab347f 100644 --- a/remmina-plugins/nx/nx_session_manager.c +++ b/remmina-plugins/nx/nx_session_manager.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/rdp/CMakeLists.txt b/remmina-plugins/rdp/CMakeLists.txt index 2a8a47a15..3bb6dc19f 100644 --- a/remmina-plugins/rdp/CMakeLists.txt +++ b/remmina-plugins/rdp/CMakeLists.txt @@ -2,6 +2,7 @@ # # Copyright (C) 2011 Marc-Andre Moreau # Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo +# Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina-plugins/rdp/rdp_cliprdr.c b/remmina-plugins/rdp/rdp_cliprdr.c index bfcb44b0c..a3c51bfd1 100644 --- a/remmina-plugins/rdp/rdp_cliprdr.c +++ b/remmina-plugins/rdp/rdp_cliprdr.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2012-2012 Jean-Louis Dupond * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/rdp/rdp_cliprdr.h b/remmina-plugins/rdp/rdp_cliprdr.h index 52ffebcc5..6964cbcf6 100644 --- a/remmina-plugins/rdp/rdp_cliprdr.h +++ b/remmina-plugins/rdp/rdp_cliprdr.h @@ -3,6 +3,7 @@ * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2012-2012 Jean-Louis Dupond * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/rdp/rdp_event.c b/remmina-plugins/rdp/rdp_event.c index 3dfcfdaf9..1dcb44109 100644 --- a/remmina-plugins/rdp/rdp_event.c +++ b/remmina-plugins/rdp/rdp_event.c @@ -4,6 +4,7 @@ * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com> * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -966,6 +967,7 @@ static BOOL remmina_rdp_event_create_cursor(RemminaProtocolWidget* gp, RemminaPl cairo_surface_destroy(surface); free(data); ((rfPointer*)ui->cursor.pointer)->cursor = gdk_cursor_new_from_pixbuf(rfi->display, pixbuf, pointer->xPos, pointer->yPos); + g_object_unref(pixbuf); return TRUE; } diff --git a/remmina-plugins/rdp/rdp_file.c b/remmina-plugins/rdp/rdp_file.c index a3dca3acb..7d02254b4 100644 --- a/remmina-plugins/rdp/rdp_file.c +++ b/remmina-plugins/rdp/rdp_file.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/rdp/rdp_graphics.c b/remmina-plugins/rdp/rdp_graphics.c index 1afd8f2f1..211c9b10f 100644 --- a/remmina-plugins/rdp/rdp_graphics.c +++ b/remmina-plugins/rdp/rdp_graphics.c @@ -4,6 +4,7 @@ * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com> * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/rdp/rdp_plugin.c b/remmina-plugins/rdp/rdp_plugin.c index c85290600..ae93e3b11 100644 --- a/remmina-plugins/rdp/rdp_plugin.c +++ b/remmina-plugins/rdp/rdp_plugin.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/rdp/rdp_plugin.h b/remmina-plugins/rdp/rdp_plugin.h index 2146bac26..4ed55a94f 100644 --- a/remmina-plugins/rdp/rdp_plugin.h +++ b/remmina-plugins/rdp/rdp_plugin.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/rdp/rdp_settings.c b/remmina-plugins/rdp/rdp_settings.c index 8a8ae459c..ee5ad1c1d 100644 --- a/remmina-plugins/rdp/rdp_settings.c +++ b/remmina-plugins/rdp/rdp_settings.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/telepathy/CMakeLists.txt b/remmina-plugins/telepathy/CMakeLists.txt index 9a9f9724d..37d075f07 100644 --- a/remmina-plugins/telepathy/CMakeLists.txt +++ b/remmina-plugins/telepathy/CMakeLists.txt @@ -1,6 +1,7 @@ # remmina-plugin-telepathy - The GTK+ Remote Desktop Client # # Copyright (C) 2011 Marc-Andre Moreau +# Copyright (C) 2014-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina-plugins/telepathy/telepathy_channel_handler.c b/remmina-plugins/telepathy/telepathy_channel_handler.c index 369cbf0d9..7f287e5ac 100644 --- a/remmina-plugins/telepathy/telepathy_channel_handler.c +++ b/remmina-plugins/telepathy/telepathy_channel_handler.c @@ -1,7 +1,8 @@ /* * Remmina - The GTK+ Remote Desktop Client - * Copyright (C) 2010 Vic Lee + * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -15,7 +16,7 @@ * * 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, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. * * In addition, as a special exception, the copyright holders give diff --git a/remmina-plugins/telepathy/telepathy_handler.c b/remmina-plugins/telepathy/telepathy_handler.c index ff13c1262..1bf611f57 100644 --- a/remmina-plugins/telepathy/telepathy_handler.c +++ b/remmina-plugins/telepathy/telepathy_handler.c @@ -1,7 +1,8 @@ /* * Remmina - The GTK+ Remote Desktop Client - * Copyright (C) 2010 Vic Lee + * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -15,7 +16,7 @@ * * 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, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. * * In addition, as a special exception, the copyright holders give diff --git a/remmina-plugins/telepathy/telepathy_plugin.c b/remmina-plugins/telepathy/telepathy_plugin.c index 932f4e037..2fa3ac9cb 100644 --- a/remmina-plugins/telepathy/telepathy_plugin.c +++ b/remmina-plugins/telepathy/telepathy_plugin.c @@ -1,7 +1,8 @@ /* * Remmina - The GTK+ Remote Desktop Client - * Copyright (C) 2010 Vic Lee + * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -15,7 +16,7 @@ * * 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, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. * * In addition, as a special exception, the copyright holders give diff --git a/remmina-plugins/tool_hello_world/CMakeLists.txt b/remmina-plugins/tool_hello_world/CMakeLists.txt index 047dae1e4..88f62bf54 100644 --- a/remmina-plugins/tool_hello_world/CMakeLists.txt +++ b/remmina-plugins/tool_hello_world/CMakeLists.txt @@ -1,6 +1,7 @@ # remmina-plugin-tool_hello_world - The GTK+ Remote Desktop Client # # Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo +# Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina-plugins/tool_hello_world/plugin.c b/remmina-plugins/tool_hello_world/plugin.c index f64a435e0..ae8812de4 100644 --- a/remmina-plugins/tool_hello_world/plugin.c +++ b/remmina-plugins/tool_hello_world/plugin.c @@ -1,8 +1,8 @@ /* * Remmina - The GTK+ Remote Desktop Client - * Copyright (C) 2016 Antenore Gatta, Giovanni Panozzo - * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo * Copyright (C) 2010 Vic Lee + * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/tool_hello_world/plugin_config.h b/remmina-plugins/tool_hello_world/plugin_config.h index 46b269546..154c25192 100644 --- a/remmina-plugins/tool_hello_world/plugin_config.h +++ b/remmina-plugins/tool_hello_world/plugin_config.h @@ -1,7 +1,7 @@ /* * Remmina - The GTK+ Remote Desktop Client - * Copyright (C) 2016 Antenore Gatta, Giovanni Panozzo * Copyright (C) 2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina-plugins/vnc/CMakeLists.txt b/remmina-plugins/vnc/CMakeLists.txt index 2c9b309d6..a74178111 100644 --- a/remmina-plugins/vnc/CMakeLists.txt +++ b/remmina-plugins/vnc/CMakeLists.txt @@ -1,7 +1,7 @@ # remmina-plugin-vnc - The GTK+ Remote Desktop Client # -# Copyright (C) 2016 Antenore Gatta, Giovanni Panozzo # Copyright (C) 2011 Marc-Andre Moreau +# Copyright (C) 2014-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina-plugins/vnc/vnc_plugin.c b/remmina-plugins/vnc/vnc_plugin.c index 690e8d663..f2a4b044b 100644 --- a/remmina-plugins/vnc/vnc_plugin.c +++ b/remmina-plugins/vnc/vnc_plugin.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -809,6 +810,10 @@ static gboolean remmina_plugin_vnc_queue_cuttext(RemminaPluginVncCuttextParam *p RemminaPluginVncData *gpdata = GET_PLUGIN_DATA(gp); GTimeVal t; glong diff; + const char *cur_charset; + gchar *text; + gsize br, bw; + if (GTK_IS_WIDGET(gp) && gpdata->connected) { @@ -818,7 +823,11 @@ static gboolean remmina_plugin_vnc_queue_cuttext(RemminaPluginVncCuttextParam *p if (diff >= 10) { gpdata->clipboard_timer = t; - gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), param->text, param->textlen); + /* Convert text from VNC latin-1 to current GTK charset (usually UTF-8) */ + g_get_charset(&cur_charset); + text = g_convert_with_fallback(param->text, -1, cur_charset, "ISO-8859-1" ,"?", &br, &bw, NULL); + gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), text, bw); + g_free(text); } } g_free(param->text); @@ -1626,6 +1635,9 @@ static void remmina_plugin_vnc_on_cuttext_request(GtkClipboard *clipboard, const RemminaPluginVncData *gpdata = GET_PLUGIN_DATA(gp); GTimeVal t; glong diff; + gsize br, bw; + gchar *latin1_text; + const char *cur_charset; if (text) { @@ -1637,7 +1649,12 @@ static void remmina_plugin_vnc_on_cuttext_request(GtkClipboard *clipboard, const return; gpdata->clipboard_timer = t; - remmina_plugin_vnc_event_push(gp, REMMINA_PLUGIN_VNC_EVENT_CUTTEXT, (gpointer) text, NULL, NULL); + /* Convert text from current charset to latin-1 before sending to remote server. + * See RFC6143 7.5.6 */ + g_get_charset(&cur_charset); + latin1_text = g_convert_with_fallback(text, -1, "ISO-8859-1", cur_charset ,"?", &br, &bw, NULL); + remmina_plugin_vnc_event_push(gp, REMMINA_PLUGIN_VNC_EVENT_CUTTEXT, (gpointer) latin1_text, NULL, NULL); + g_free(latin1_text); } } diff --git a/remmina-plugins/xdmcp/CMakeLists.txt b/remmina-plugins/xdmcp/CMakeLists.txt index 5513b79f8..159c58a55 100644 --- a/remmina-plugins/xdmcp/CMakeLists.txt +++ b/remmina-plugins/xdmcp/CMakeLists.txt @@ -1,6 +1,7 @@ # remmina-plugin-xdmcp - The GTK+ Remote Desktop Client # # Copyright (C) 2011 Marc-Andre Moreau +# Copyright (C) 2014-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina-plugins/xdmcp/xdmcp_plugin.c b/remmina-plugins/xdmcp/xdmcp_plugin.c index dbfb3e36d..b45d7674e 100644 --- a/remmina-plugins/xdmcp/xdmcp_plugin.c +++ b/remmina-plugins/xdmcp/xdmcp_plugin.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/CMakeLists.txt b/remmina/CMakeLists.txt index df6f580e7..8c11c8cd8 100644 --- a/remmina/CMakeLists.txt +++ b/remmina/CMakeLists.txt @@ -2,6 +2,7 @@ # # Copyright (C) 2011 Marc-Andre Moreau # Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo +# Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina/desktop/CMakeLists.txt b/remmina/desktop/CMakeLists.txt index b2849023e..df884e732 100644 --- a/remmina/desktop/CMakeLists.txt +++ b/remmina/desktop/CMakeLists.txt @@ -2,7 +2,7 @@ # # Copyright (C) 2011 Marc-Andre Moreau # Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo -# Copyright (C) 2014-2016 Antenore Gatta, Giovanni Panozzo +# Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina/external_tools/CMakeLists.txt b/remmina/external_tools/CMakeLists.txt index e51f12ac6..6e8576759 100644 --- a/remmina/external_tools/CMakeLists.txt +++ b/remmina/external_tools/CMakeLists.txt @@ -1,6 +1,7 @@ # desktop/remmina - The GTK+ Remote Desktop Client # # Copyright (C) 2011 Marc-Andre Moreau +# Copyright (C) 2014-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina/icons/CMakeLists.txt b/remmina/icons/CMakeLists.txt index 7ea4c2043..8af8d403b 100644 --- a/remmina/icons/CMakeLists.txt +++ b/remmina/icons/CMakeLists.txt @@ -1,6 +1,7 @@ # icons/remmina - The GTK+ Remote Desktop Client # # Copyright (C) 2011 Marc-Andre Moreau +# Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina/include/remmina/plugin.h b/remmina/include/remmina/plugin.h index 671d9a835..5e90cb564 100644 --- a/remmina/include/remmina/plugin.h +++ b/remmina/include/remmina/plugin.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/include/remmina/remmina_trace_calls.h b/remmina/include/remmina/remmina_trace_calls.h index ec388eff1..a43ce2ba8 100644 --- a/remmina/include/remmina/remmina_trace_calls.h +++ b/remmina/include/remmina/remmina_trace_calls.h @@ -1,6 +1,7 @@ /* * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -14,7 +15,7 @@ * * 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, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. * * In addition, as a special exception, the copyright holders give @@ -49,7 +50,7 @@ } #else -#define TRACE_CALL(text) +#define TRACE_CALL(text) #endif /* _WITH_TRACE_CALLS_ */ #endif /* __REMMINATRACECALLS_H__ */ diff --git a/remmina/include/remmina/types.h b/remmina/include/remmina/types.h index 6d9a83613..63ecac654 100644 --- a/remmina/include/remmina/types.h +++ b/remmina/include/remmina/types.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/po/CMakeLists.txt b/remmina/po/CMakeLists.txt index 1cfeba9c5..5f239c28d 100644 --- a/remmina/po/CMakeLists.txt +++ b/remmina/po/CMakeLists.txt @@ -1,6 +1,7 @@ # po/remmina - The GTK+ Remote Desktop Client # # Copyright (C) 2011 Marc-Andre Moreau +# Copyright (C) 2014-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina/po/da.po b/remmina/po/da.po index 9e0112548..33857e4e4 100644 --- a/remmina/po/da.po +++ b/remmina/po/da.po @@ -1,46 +1,43 @@ # Danish translation for remmina # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 # This file is distributed under the same license as the remmina package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2012. -# +# scootergrisen, 2017. msgid "" msgstr "" "Project-Id-Version: remmina\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-05 15:12+0200\n" -"PO-Revision-Date: 2012-03-22 12:19+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: Danish <da@li.org>\n" +"PO-Revision-Date: 2017-10-21 23:27+0200\n" +"Last-Translator: scootergrisen\n" +"Language-Team: Danish\n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2014-04-10 15:03+0000\n" -"X-Generator: Launchpad (build 16976)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: remmina/src/remmina_mpchange.c:235 msgid "The passwords do not match" -msgstr "" +msgstr "Adgangskoderne er ikke ens" #: remmina/src/remmina_mpchange.c:245 msgid "Resetting passwords, please wait..." -msgstr "" +msgstr "Nulstiller adgangskoder, vent venligst..." #: remmina/src/remmina_mpchange.c:406 #, c-format msgid "%d password changed." msgid_plural "%d passwords changed." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d adgangskode blev ændret." +msgstr[1] "%d adgangskoder blev ændret." #: remmina/src/remmina_connection_window.c:428 #, c-format msgid "" "There are %i active connections in the current window. Are you sure to close?" msgstr "" -"Der er %i aktive forbindelser i det aktuelle vindue. Er du sikker på at " -"lukke?" +"Der er %i aktive forbindelser i det nuværende vindue. Er du sikker på, at du " +"vil lukke?" #: remmina/src/remmina_connection_window.c:1119 msgid "Viewport fullscreen mode" @@ -52,23 +49,25 @@ msgstr "Rullet - fuldskærmstilstand" #: remmina/src/remmina_connection_window.c:1194 msgid "Keep aspect ratio when scaled" -msgstr "" +msgstr "Bevar højde-bredde-forhold når skaleret" #: remmina/src/remmina_connection_window.c:1204 msgid "Fill client window when scaled" -msgstr "" +msgstr "Udfyld klientens vindue når skaleret" #: remmina/src/remmina_connection_window.c:1590 #: remmina/src/remmina_pref_dialog.c:106 #: remmina/ui/remmina_preferences.glade:261 msgid "Keystrokes" -msgstr "" +msgstr "Tastetryk" #: remmina/src/remmina_connection_window.c:1683 msgid "" "Warning: screenshot is scaled or distorted. Disable scaling to have better " "screenshot." msgstr "" +"Advarsel: skærmbilledet er skaleret eller forvrænget. Deaktivér skalering " +"for at få et bedre skærmbillede." #: remmina/src/remmina_connection_window.c:1795 msgid "Resize the window to fit in remote resolution" @@ -77,7 +76,7 @@ msgstr "Tilpas størrelsen på vinduet efter serverens opløsning" #: remmina/src/remmina_connection_window.c:1805 #: remmina/ui/remmina_preferences.glade:725 msgid "Toggle fullscreen mode" -msgstr "Toggle fuldskærmstilstand" +msgstr "Fuldskærmstilstand til/fra" #: remmina/src/remmina_connection_window.c:1845 #: remmina/ui/remmina_preferences.glade:781 @@ -87,7 +86,7 @@ msgstr "Skift faneblade" #: remmina/src/remmina_connection_window.c:1859 #: remmina/ui/remmina_preferences.glade:822 msgid "Toggle scaled mode" -msgstr "Vælg skaleret mode" +msgstr "Skaleret tilstand til/fra" #: remmina/src/remmina_connection_window.c:1892 msgid "Grab all keyboard events" @@ -96,7 +95,7 @@ msgstr "Fang alle tastetryk" #: remmina/src/remmina_connection_window.c:1901 #: remmina/ui/remmina_main.glade:42 remmina/ui/remmina_main.glade:43 msgid "Preferences" -msgstr "Indstillinger" +msgstr "Præferencer" #: remmina/src/remmina_connection_window.c:1909 #: remmina/src/remmina_connection_window.c:1910 @@ -106,7 +105,7 @@ msgstr "Værktøjer" #: remmina/src/remmina_connection_window.c:1922 #: remmina/ui/remmina_preferences.glade:962 msgid "Screenshot" -msgstr "" +msgstr "Skærmbillede" #: remmina/src/remmina_connection_window.c:1929 #: remmina/ui/remmina_preferences.glade:878 @@ -116,91 +115,91 @@ msgstr "Minimér vindue" #: remmina/src/remmina_connection_window.c:1936 #: remmina/ui/remmina_preferences.glade:906 msgid "Disconnect" -msgstr "Afbryd forbindelse" +msgstr "Afbryd forbindelsen" #: remmina/src/remmina_connection_window.c:3672 #: remmina/src/remmina_file_editor.c:1495 #: remmina/src/remmina_file_editor.c:1516 #, c-format msgid "File %s not found." -msgstr "Fil %s ikke fundet." +msgstr "Filen %s findes ikke." #: remmina/src/remmina_ssh.c:195 #, c-format msgid "SSH password authentication failed: %s" -msgstr "SSH adgangskode genkendelse mislykkedes: %s" +msgstr "Autentifikation af SSH-adgangskode mislykkedes: %s" #: remmina/src/remmina_ssh.c:214 remmina/src/remmina_ssh.c:224 #: remmina/src/remmina_ssh.c:233 #, c-format msgid "SSH public key authentication failed: %s" -msgstr "SSH offentlig nøgle genkendelse mislykkedes: %s" +msgstr "Autentifikation af offentlig SSH-nøgle mislykkedes: %s" #: remmina/src/remmina_ssh.c:215 msgid "SSH Key file not yet set." -msgstr "SSH nøglefil ikke valgt" +msgstr "SSH-nøglefil ikke valgt." #: remmina/src/remmina_ssh.c:251 #, c-format msgid "SSH automatic public key authentication failed: %s" -msgstr "SSH automatisk offentlig nøgle genkendelse mislykkedes: %s" +msgstr "Autentifikation af automatisk offentlig SSH-nøgle mislykkedes: %s" #: remmina/src/remmina_ssh.c:268 #, c-format msgid "SSH public key authentication with ssh agent failed: %s" -msgstr "" +msgstr "Autentifikation af offentlig SSH-nøgle med ssh-agent mislykkedes: %s" #: remmina/src/remmina_ssh.c:288 #, c-format msgid "SSH Kerberos/GSSAPI authentication failed: %s" -msgstr "" +msgstr "Autentifikation af SSH-Kerberos/GSSAPI mislykkedes: %s" #: remmina/src/remmina_ssh.c:401 #, c-format msgid "Authenticating %s's password to SSH server %s..." -msgstr "Validere %s's adgangskode på SSH server %s..." +msgstr "Autentificerer %s's adgangskode på SSH-serveren %s..." #: remmina/src/remmina_ssh.c:402 remmina/src/remmina_protocol_widget.c:989 msgid "SSH password" -msgstr "SSH adgangskode" +msgstr "SSH-adgangskode" #: remmina/src/remmina_ssh.c:407 #, c-format msgid "Authenticating %s's identity to SSH server %s..." -msgstr "Validere %s's identitet på SSH server %s..." +msgstr "Autentificerer %s's identitet på SSH-serveren %s..." #: remmina/src/remmina_ssh.c:408 remmina/src/remmina_protocol_widget.c:992 msgid "SSH private key passphrase" -msgstr "SSH privat nøglekode" +msgstr "Nøgleord for privat SSH-nøgle" #: remmina/src/remmina_ssh.c:412 #, c-format msgid "Authenticating %s's Kerberos to SSH server %s..." -msgstr "" +msgstr "Autentificerer %s's Kerberos på SSH-serveren %s..." #: remmina/src/remmina_ssh.c:413 msgid "SSH Kerberos/GSSAPI" -msgstr "" +msgstr "SSH-Kerberos/GSSAPI" #: remmina/src/remmina_ssh.c:497 #, c-format msgid "Failed to startup SSH session: %s" -msgstr "Kunne ikke åbne SSH session: %s" +msgstr "Kunne ikke åbne SSH-session: %s" #: remmina/src/remmina_ssh.c:877 #, c-format msgid "Failed to connect to the SSH tunnel destination: %s" -msgstr "Kunne ikke forbinde SSH tunnel destinationen: %s" +msgstr "Kunne ikke oprette forbindelse til SSH-tunnel destinationen: %s" #: remmina/src/remmina_ssh.c:910 #, c-format msgid "Failed to execute %s on SSH server : %%s" -msgstr "Kunne ikke udføre %s på SSH server: %%s" +msgstr "Kunne ikke udføre %s på SSH-server: %%s" #: remmina/src/remmina_ssh.c:948 remmina/src/remmina_ssh.c:975 #, c-format msgid "Failed to request port forwarding : %s" -msgstr "Kunne ikke anmode om port viderestilling : %s" +msgstr "Kunne ikke anmode om viderestilling af port : %s" #: remmina/src/remmina_ssh.c:1023 msgid "No response from the server." @@ -209,12 +208,12 @@ msgstr "Intet svar fra serveren." #: remmina/src/remmina_ssh.c:1453 #, c-format msgid "Failed to create sftp session: %s" -msgstr "Kunne ikke lave sftp session: %s" +msgstr "Kunne ikke oprette sftp-session: %s" #: remmina/src/remmina_ssh.c:1458 #, c-format msgid "Failed to initialize sftp session: %s" -msgstr "Kunne ikke starte sftp session: %s" +msgstr "Kunne ikke initiere sftp-session: %s" #: remmina/src/remmina_about.c:54 msgid "translator-credits" @@ -222,7 +221,8 @@ msgstr "" "Launchpad Contributions:\n" " Joe Hansen https://launchpad.net/~joedalton2\n" " Niels Kristensen https://launchpad.net/~nielskri\n" -" Vic https://launchpad.net/~llyzs" +" Vic https://launchpad.net/~llyzs\n" +"scootergrisen" #: remmina/src/remmina_sftp_plugin.c:283 remmina/src/remmina_file_editor.c:906 #: remmina/src/remmina_init_dialog.c:369 remmina/src/remmina_ssh_plugin.c:696 @@ -232,7 +232,7 @@ msgstr "Adgangskode" #: remmina/src/remmina_sftp_plugin.c:284 remmina/src/remmina_ssh_plugin.c:698 msgid "SSH agent" -msgstr "" +msgstr "SSH-agent" #: remmina/src/remmina_sftp_plugin.c:285 remmina/src/remmina_file_editor.c:913 #: remmina/src/remmina_ssh_plugin.c:699 @@ -241,7 +241,7 @@ msgstr "Offentlig nøgle (automatisk)" #: remmina/src/remmina_sftp_plugin.c:286 remmina/src/remmina_ssh_plugin.c:697 msgid "SSH identity file" -msgstr "" +msgstr "SSH-identitetsfil" #: remmina/src/remmina_sftp_plugin.c:294 msgid "Show Hidden Files" @@ -249,7 +249,7 @@ msgstr "Vis skjulte filer" #: remmina/src/remmina_sftp_plugin.c:295 msgid "Overwrite all" -msgstr "" +msgstr "Overskriv alle" #: remmina/src/remmina_sftp_plugin.c:311 remmina/src/remmina_file_editor.c:896 #: remmina/src/remmina_init_dialog.c:354 remmina/src/remmina_ssh_plugin.c:790 @@ -264,17 +264,17 @@ msgstr "Brugernavn" #: remmina-plugins/rdp/rdp_plugin.c:1368 remmina-plugins/vnc/vnc_plugin.c:1989 #: remmina-plugins/vnc/vnc_plugin.c:2009 msgid "User password" -msgstr "" +msgstr "Brugerens adgangskode" #: remmina/src/remmina_sftp_plugin.c:313 remmina/src/remmina_ssh_plugin.c:792 msgid "Authentication type" -msgstr "" +msgstr "Autentifikationstype" #: remmina/src/remmina_sftp_plugin.c:314 remmina/src/remmina_file_editor.c:343 #: remmina/src/remmina_file_editor.c:350 remmina/src/remmina_ssh_plugin.c:793 #: remmina-plugins/nx/nx_plugin.c:759 msgid "Identity file" -msgstr "Identitets fil" +msgstr "Identitetsfil" #: remmina/src/remmina_sftp_plugin.c:323 msgid "SFTP - Secure File Transfer" @@ -293,7 +293,7 @@ msgstr "Fejl ved oprettelse af filen %s." #: remmina/src/remmina_sftp_client.c:225 #, c-format msgid "Error opening file %s on server. %s" -msgstr "Fejl ved åbning af fil %s på server. %s" +msgstr "Fejl ved åbning af filen %s på server. %s" #: remmina/src/remmina_sftp_client.c:251 #, c-format @@ -328,37 +328,37 @@ msgstr "Fejl ved skrivning af filen %s på server. %s" #: remmina/src/remmina_sftp_client.c:745 remmina/src/remmina_sftp_client.c:818 #, c-format msgid "Failed to open directory %s. %s" -msgstr "Fejl ved åbning af mappen %s. %s" +msgstr "Kunne ikke åbne mappen %s. %s" #: remmina/src/remmina_sftp_client.c:764 #, c-format msgid "Failed reading directory. %s" -msgstr "Fejl ved læsning af mappen. %s" +msgstr "Kunne ikke læse mappen. %s" #: remmina/src/remmina_sftp_client.c:885 msgid "" "File transfer currently in progress.\n" "Are you sure to cancel it?" msgstr "" -"En filoverførsel er i gang.\n" -"Er du sikker på at du vil annullere den?" +"Igangværende filoverførsel.\n" +"Er du sikker på, at du vil annullere den?" #: remmina/src/remmina_sftp_client.c:922 #, c-format msgid "Failed to delete '%s'. %s" -msgstr "Fejl ved sletning af '%s'. %s" +msgstr "Kunne ikke slette '%s'. %s" #: remmina/src/remmina_sftp_client.c:1001 msgid "File exists" -msgstr "" +msgstr "Filen findes" #: remmina/src/remmina_sftp_client.c:1004 msgid "Resume" -msgstr "" +msgstr "Genoptag" #: remmina/src/remmina_sftp_client.c:1005 msgid "Overwrite" -msgstr "" +msgstr "Overskriv" #: remmina/src/remmina_sftp_client.c:1006 remmina/src/remmina_file_editor.c:146 #: remmina/src/remmina_file_editor.c:351 remmina/src/remmina_file_editor.c:1245 @@ -369,15 +369,15 @@ msgstr "" #: remmina/ui/remmina_key_chooser.glade:8 #: remmina/ui/remmina_key_chooser.glade:9 msgid "_Cancel" -msgstr "" +msgstr "_Annuller" #: remmina/src/remmina_sftp_client.c:1015 msgid "Question" -msgstr "" +msgstr "Spørgsmål" #: remmina/src/remmina_sftp_client.c:1023 msgid "The following file already exists in the target folder:" -msgstr "" +msgstr "Den følgende fil findes allerede i målmappen:" #: remmina/src/remmina_main.c:574 #, c-format @@ -389,7 +389,7 @@ msgstr[1] "Total %i elementer." #: remmina/src/remmina_main.c:716 #, c-format msgid "Are you sure to delete '%s'" -msgstr "Er du sikker på at slette '%s'" +msgstr "Er du sikker på, at du vil slette '%s'" #: remmina/src/remmina_main.c:838 #, c-format @@ -407,7 +407,7 @@ msgstr "Importér" #: remmina/src/remmina_main.c:891 remmina/src/remmina_file_editor.c:1239 msgid "_Save" -msgstr "" +msgstr "_Gem" #: remmina/src/remmina_main.c:901 msgid "This protocol does not support exporting." @@ -416,12 +416,12 @@ msgstr "Denne protokol understøtter ikke eksport." #: remmina/src/remmina_main.c:1101 remmina/src/remmina_icon.c:508 #: remmina/src/remmina_icon.c:509 msgid "Remmina Remote Desktop Client" -msgstr "Remmina Fjernskrivebords Klient" +msgstr "Remmina-fjernskrivebordsklient" #: remmina/src/remmina_exec.c:241 #, c-format msgid "Plugin %s is not registered." -msgstr "Plugin %s er ikke registreret." +msgstr "Pluginet %s er ikke registreret." #: remmina/src/remmina_file_editor.c:74 msgid "" @@ -451,16 +451,16 @@ msgstr "" #: remmina/src/remmina_file_editor.c:144 msgid "Choose a Remote Desktop Server" -msgstr "Vælg en Terminal Server" +msgstr "Vælg en fjernskrivebord-server" #: remmina/src/remmina_file_editor.c:147 remmina/src/remmina_init_dialog.c:87 #: remmina/src/remmina_plugin_manager.c:344 msgid "_OK" -msgstr "" +msgstr "_OK" #: remmina/src/remmina_file_editor.c:352 msgid "_Open" -msgstr "" +msgstr "_Åbn" #: remmina/src/remmina_file_editor.c:395 remmina/src/remmina_file_editor.c:852 #: remmina/src/remmina_protocol_widget.c:1245 remmina/ui/remmina_main.glade:678 @@ -470,7 +470,7 @@ msgstr "Server" #: remmina/src/remmina_file_editor.c:420 #, c-format msgid "Browse the network to find a %s server" -msgstr "Gennemse netværket for at finde en %s server" +msgstr "Gennemse netværket for at finde en %s-server" #: remmina/src/remmina_file_editor.c:482 remmina/src/remmina_pref_dialog.c:79 #: remmina/ui/remmina_preferences.glade:235 @@ -479,7 +479,7 @@ msgstr "Opløsninger" #: remmina/src/remmina_file_editor.c:482 remmina/src/remmina_pref_dialog.c:79 msgid "Configure the available resolutions" -msgstr "" +msgstr "Konfigurer de tilgængelige opløsninger" #: remmina/src/remmina_file_editor.c:500 msgid "Resolution" @@ -487,7 +487,7 @@ msgstr "Opløsning" #: remmina/src/remmina_file_editor.c:506 msgid "Use window size" -msgstr "Brug vinduesstørrelse" +msgstr "Brug vinduets størrelse" #: remmina/src/remmina_file_editor.c:506 msgid "Use client resolution" @@ -499,15 +499,15 @@ msgstr "Tilpasset" #: remmina/src/remmina_file_editor.c:706 msgid "Keyboard mapping" -msgstr "Tastebrug" +msgstr "Tastaturkortlægning" #: remmina/src/remmina_file_editor.c:804 msgid "Enable SSH tunnel" -msgstr "Aktiver SSH tunnel" +msgstr "Aktivér SSH-tunnel" #: remmina/src/remmina_file_editor.c:811 msgid "Tunnel via loopback address" -msgstr "Tunnel via loopback adresse" +msgstr "Tunnel via loopback-adresse" #: remmina/src/remmina_file_editor.c:822 #, c-format @@ -524,15 +524,15 @@ msgstr "Opstartssti" #: remmina/src/remmina_file_editor.c:888 msgid "SSH Authentication" -msgstr "SSH Autentificering" +msgstr "SSH-autentifikation" #: remmina/src/remmina_file_editor.c:899 msgid "SSH Agent (automatic)" -msgstr "" +msgstr "SSH-agent (automatisk)" #: remmina/src/remmina_file_editor.c:974 msgid "Basic" -msgstr "Generelt" +msgstr "Grundlæggende" #: remmina/src/remmina_file_editor.c:981 msgid "Advanced" @@ -540,16 +540,16 @@ msgstr "Avanceret" #: remmina/src/remmina_file_editor.c:1187 msgid "Default settings saved." -msgstr "Standard indstillinger gemt." +msgstr "Standardindstillinger gemt." #: remmina/src/remmina_file_editor.c:1237 msgid "Remote Desktop Preference" -msgstr "Fjernskrivebords Indstilling" +msgstr "Præference for fjernskrivebord" #: remmina/src/remmina_file_editor.c:1248 remmina/ui/remmina_main.glade:78 #: remmina/ui/remmina_main.glade:79 msgid "Connect" -msgstr "" +msgstr "Opret forbindelse" #: remmina/src/remmina_file_editor.c:1259 #: remmina-plugins/xdmcp/xdmcp_plugin.c:381 @@ -569,7 +569,7 @@ msgstr "Navn" #: remmina/src/remmina_file_editor.c:1365 msgid "Quick Connect" -msgstr "Forbind Hurtigt" +msgstr "Hurtig forbindelse" #: remmina/src/remmina_file_editor.c:1378 remmina/src/remmina_ftp_client.c:980 #: remmina/ui/remmina_main.glade:664 remmina/ui/remmina_mpc.glade:99 @@ -580,7 +580,7 @@ msgstr "Gruppe" #: remmina/src/remmina_file_editor.c:1391 #, c-format msgid "Use '%s' as subgroup delimiter" -msgstr "Brug »%s« som adskillelsestegn for undergruppe" +msgstr "Brug '%s' som afgrænser for undergruppe" #: remmina/src/remmina_file_editor.c:1396 #: remmina/src/remmina_plugin_manager.c:64 @@ -589,32 +589,32 @@ msgstr "Protokol" #: remmina/src/remmina_file_editor.c:1410 msgid "Pre Command" -msgstr "" +msgstr "Prækommando" #: remmina/src/remmina_file_editor.c:1424 #: remmina/src/remmina_file_editor.c:1443 msgid "Script/command full path w/o arguments" -msgstr "" +msgstr "Script/kommando fuld sti med/uden argumenter" #: remmina/src/remmina_file_editor.c:1429 msgid "Post Command" -msgstr "" +msgstr "Efterkommando" #: remmina/src/remmina_ftp_client.c:421 msgid "Choose download location" -msgstr "Vælg download placering" +msgstr "Vælg downloadplacering" #: remmina/src/remmina_ftp_client.c:566 msgid "Are you sure to delete the selected files on server?" -msgstr "Er du sikker på at slette de valgte filer på serveren?" +msgstr "Er du sikker på, at du vil slette de valgte filer på serveren?" #: remmina/src/remmina_ftp_client.c:625 msgid "Choose a file to upload" -msgstr "Vælg en fil at uploade" +msgstr "Vælg en fil der skal uploades" #: remmina/src/remmina_ftp_client.c:633 msgid "Upload folder" -msgstr "Upload mappe" +msgstr "Uploadmappe" #: remmina/src/remmina_ftp_client.c:694 remmina/src/remmina_ftp_client.c:819 msgid "Download" @@ -627,11 +627,11 @@ msgstr "Upload" #: remmina/src/remmina_ftp_client.c:708 remmina/ui/remmina_main.glade:109 #: remmina/ui/remmina_main.glade:110 msgid "_Delete" -msgstr "" +msgstr "_Slet" #: remmina/src/remmina_ftp_client.c:798 msgid "Home" -msgstr "" +msgstr "Hjem" #: remmina/src/remmina_ftp_client.c:800 msgid "Go to home folder" @@ -639,7 +639,7 @@ msgstr "Gå til hjemmemappe" #: remmina/src/remmina_ftp_client.c:805 msgid "Up" -msgstr "" +msgstr "Op" #: remmina/src/remmina_ftp_client.c:807 msgid "Go to parent folder" @@ -648,11 +648,11 @@ msgstr "Gå til overliggende mappe" #: remmina/src/remmina_ftp_client.c:812 remmina-plugins/rdp/rdp_plugin.c:1414 #: remmina-plugins/vnc/vnc_plugin.c:2043 msgid "Refresh" -msgstr "" +msgstr "Opdater" #: remmina/src/remmina_ftp_client.c:814 msgid "Refresh current folder" -msgstr "Opdater den aktuelle mappe" +msgstr "Opdater den nuværende mappe" #: remmina/src/remmina_ftp_client.c:821 msgid "Download from server" @@ -664,7 +664,7 @@ msgstr "Upload til server" #: remmina/src/remmina_ftp_client.c:839 msgid "Delete" -msgstr "" +msgstr "Slet" #: remmina/src/remmina_ftp_client.c:841 msgid "Delete files on server" @@ -696,7 +696,7 @@ msgstr "Lokal" #: remmina/src/remmina_ftp_client.c:1059 msgid "Progress" -msgstr "Status" +msgstr "Forløb" #: remmina/src/remmina_init_dialog.c:276 #, c-format @@ -706,7 +706,7 @@ msgstr "Gem %s" #: remmina/src/remmina_init_dialog.c:385 remmina-plugins/rdp/rdp_plugin.c:1369 #: remmina/ui/remmina_mpc.glade:138 msgid "Domain" -msgstr "" +msgstr "Domæne" #: remmina/src/remmina_init_dialog.c:402 msgid "Save password" @@ -714,63 +714,63 @@ msgstr "Gem adgangskode" #: remmina/src/remmina_init_dialog.c:476 msgid "Certificate Details:" -msgstr "" +msgstr "Certifikatdetaljer:" #: remmina/src/remmina_init_dialog.c:489 remmina/src/remmina_init_dialog.c:593 msgid "Subject:" -msgstr "" +msgstr "Emne:" #: remmina/src/remmina_init_dialog.c:501 remmina/src/remmina_init_dialog.c:606 msgid "Issuer:" -msgstr "" +msgstr "Udsteder:" #: remmina/src/remmina_init_dialog.c:513 msgid "Fingerprint:" -msgstr "" +msgstr "Fingeraftryk:" #: remmina/src/remmina_init_dialog.c:526 msgid "Accept Certificate?" -msgstr "" +msgstr "Accepter certifikat?" #: remmina/src/remmina_init_dialog.c:580 msgid "Certificate Changed! Details:" -msgstr "" +msgstr "Certifikatet er blevet ændret! Detaljer:" #: remmina/src/remmina_init_dialog.c:618 msgid "Old Fingerprint:" -msgstr "" +msgstr "Gammelt fingeraftryk:" #: remmina/src/remmina_init_dialog.c:630 msgid "New Fingerprint:" -msgstr "" +msgstr "Nyt fingeraftryk:" #: remmina/src/remmina_init_dialog.c:643 msgid "Accept Changed Certificate?" -msgstr "" +msgstr "Accepter ændret certifikat?" #: remmina/src/remmina_init_dialog.c:746 msgid "CA certificate" -msgstr "CA certifikat" +msgstr "CA-certifikat" #: remmina/src/remmina_init_dialog.c:747 msgid "CA CRL" -msgstr "CA CRL" +msgstr "CA-CRL" #: remmina/src/remmina_init_dialog.c:748 msgid "Client certificate" -msgstr "Klient certifikat" +msgstr "Klientcertifikat" #: remmina/src/remmina_init_dialog.c:749 msgid "Client key" -msgstr "Klient nøgle" +msgstr "Klientnøgle" #: remmina/src/remmina_init_dialog.c:821 msgid "Do you trust the new public key?" -msgstr "" +msgstr "Stoler du på den nye offentlige nøgle?" #: remmina/src/remmina_init_dialog.c:849 msgid "The server is unknown. The public key fingerprint is:" -msgstr "" +msgstr "Serveren er ukendt. Fingeraftrykket af den offentlige nøgle er:" #: remmina/src/remmina_init_dialog.c:858 msgid "" @@ -778,6 +778,10 @@ msgid "" "under attack,\n" "or the administrator has changed the key. The new public key fingerprint is:" msgstr "" +"ADVARSEL: Serveren har ændret sin offentlige nøgle. Det betyder enten at du " +"er under angreb,\n" +"eller at administratoren har ændret nøglen. Det nye fingeraftryk til den " +"offentlige nøgle er:" #: remmina/src/remmina_applet_menu_item.c:115 msgid "Discovered" @@ -785,7 +789,7 @@ msgstr "Opdaget" #: remmina/src/remmina_applet_menu_item.c:120 msgid "New Connection" -msgstr "Ny Forbindelse" +msgstr "Ny forbindelse" #: remmina/src/remmina_plugin_manager.c:64 msgid "Entry" @@ -805,12 +809,12 @@ msgstr "Præference" #: remmina/src/remmina_plugin_manager.c:64 msgid "Secret" -msgstr "" +msgstr "Hemmelighed" #: remmina/src/remmina_plugin_manager.c:344 remmina/ui/remmina_main.glade:61 #: remmina/ui/remmina_main.glade:62 remmina/ui/remmina_main.glade:463 msgid "Plugins" -msgstr "Udvidelser" +msgstr "Plugins" #: remmina/src/remmina_plugin_manager.c:368 #: remmina-plugins/nx/nx_session_manager.c:198 @@ -827,33 +831,33 @@ msgstr "Version" #: remmina/src/remmina_icon.c:137 msgid "Open Main Window" -msgstr "Åben Hovedvindue" +msgstr "Åbn hovedvindue" #: remmina/src/remmina_icon.c:142 msgid "_Preferences" -msgstr "" +msgstr "_Præferencer" #: remmina/src/remmina_icon.c:147 remmina/ui/remmina_main.glade:52 #: remmina/ui/remmina_main.glade:53 msgid "_About" -msgstr "" +msgstr "_Om" #: remmina/src/remmina_icon.c:157 msgid "Enable Service Discovery" -msgstr "Aktiver service opdagelse" +msgstr "Aktivér opdagelse af tjenester" #: remmina/src/remmina_icon.c:171 remmina/ui/remmina_main.glade:33 #: remmina/ui/remmina_main.glade:34 msgid "_Quit" -msgstr "" +msgstr "_Afslut" #: remmina/src/remmina_icon.c:398 remmina/src/remmina_icon.c:573 msgid "Remmina Applet" -msgstr "Remmina-panelprogram" +msgstr "Remmina-applet" #: remmina/src/remmina_icon.c:400 remmina/src/remmina_icon.c:575 msgid "Connect to remote desktops through the applet menu" -msgstr "Tilslut fjernskrivebord gennem applet menuen" +msgstr "Opret frobindelse til fjernskriveborde gennem applet-menuen" #: remmina/src/remmina_chat_window.c:188 #, c-format @@ -870,53 +874,53 @@ msgstr "_Ryd" #: remmina/src/remmina_ssh_plugin.c:470 msgid "Select All (Host+a)" -msgstr "" +msgstr "Vælg alt (Vært+a)" #: remmina/src/remmina_ssh_plugin.c:471 msgid "Copy (Host+c)" -msgstr "" +msgstr "Kopiér (Vært+c)" #: remmina/src/remmina_ssh_plugin.c:472 msgid "Paste (Host+v)" -msgstr "" +msgstr "Indsæt (Vært+v)" #: remmina/src/remmina_ssh_plugin.c:700 msgid "Kerberos (GSSAPI)" -msgstr "" +msgstr "Kerberos (GSSAPI)" #: remmina/src/remmina_ssh_plugin.c:772 remmina/ui/remmina_main.glade:99 #: remmina/ui/remmina_main.glade:100 remmina/ui/remmina_preferences.glade:1341 msgid "Copy" -msgstr "" +msgstr "Kopiér" #: remmina/src/remmina_ssh_plugin.c:772 msgid "_Copy" -msgstr "" +msgstr "_Kopiér" #: remmina/src/remmina_ssh_plugin.c:773 #: remmina/ui/remmina_preferences.glade:1380 msgid "Paste" -msgstr "" +msgstr "Indsæt" #: remmina/src/remmina_ssh_plugin.c:773 msgid "_Paste" -msgstr "" +msgstr "_Indsæt" #: remmina/src/remmina_ssh_plugin.c:774 msgid "Select all" -msgstr "" +msgstr "Vælg alt" #: remmina/src/remmina_ssh_plugin.c:774 msgid "_Select all" -msgstr "" +msgstr "_Vælg alt" #: remmina/src/remmina_ssh_plugin.c:794 msgid "Private key passphrase" -msgstr "" +msgstr "Nøgleord for privatnøgle" #: remmina/src/remmina_ssh_plugin.c:810 msgid "Terminal color scheme" -msgstr "" +msgstr "Terminalens farvetema" #: remmina/src/remmina_ssh_plugin.c:811 #: remmina-plugins/xdmcp/xdmcp_plugin.c:403 remmina-plugins/nx/nx_plugin.c:764 @@ -926,112 +930,112 @@ msgstr "Opstartsprogram" #: remmina/src/remmina_ssh_plugin.c:820 msgid "SSH - Secure Shell" -msgstr "SSH - Secure Shell" +msgstr "SSH - Sikker skal" #: remmina/src/remmina_public.c:679 msgid "Please enter format 'widthxheight'." -msgstr "Indtast format 'breddexhøjde'" +msgstr "Indtast venligst formatet 'breddexhøjde'." #: remmina/src/remmina.c:75 msgid "Show about dialog" -msgstr "" +msgstr "Vis Om-dialog" #: remmina/src/remmina.c:76 msgid "Connect to a .remmina file" -msgstr "" +msgstr "Opret forbindelse til en .remmina-fil" #: remmina/src/remmina.c:77 msgid "Edit a .remmina file" -msgstr "" +msgstr "Rediger en .remmina-fil" #: remmina/src/remmina.c:79 remmina/ui/remmina_main.glade:257 msgid "Create a new connection profile" -msgstr "" +msgstr "Opret en ny forbindelsesprofil" #: remmina/src/remmina.c:80 msgid "Show preferences dialog page" -msgstr "" +msgstr "Vis præferencer-dialogside" #: remmina/src/remmina.c:81 msgid "Execute the plugin" -msgstr "" +msgstr "Udfør pluginet" #: remmina/src/remmina.c:82 msgid "Quit the application" -msgstr "" +msgstr "Afslut programmet" #: remmina/src/remmina.c:83 msgid "Use default server name (for --new)" -msgstr "" +msgstr "Brug standardservernavn (til --new)" #: remmina/src/remmina.c:84 msgid "Use default protocol (for --new)" -msgstr "" +msgstr "Brug standardprotokol (til --new)" #: remmina/src/remmina.c:85 msgid "Start as tray icon" -msgstr "" +msgstr "Start som bakkeikon" #: remmina/src/remmina.c:86 msgid "Show the application's version" -msgstr "" +msgstr "Vis programmets version" #: remmina/src/remmina.c:87 msgid "Show the application's version, including the pulgin versions" -msgstr "" +msgstr "Vis programmets version, inklusiv plugin-versioner" #: remmina/src/remmina_pref_dialog.c:95 msgid "Recent lists cleared." -msgstr "Nylige lister ryddet." +msgstr "Seneste-liste ryddet." #: remmina/src/remmina_pref_dialog.c:106 #: remmina/ui/remmina_preferences.glade:271 msgid "Configure the keystrokes" -msgstr "" +msgstr "Konfigurer tastetrykkene" #: remmina/src/remmina_protocol_widget.c:138 #, c-format msgid "Connecting to '%s'..." -msgstr "Tilslutter '%s'..." +msgstr "Opretter forbindelse til '%s'..." #: remmina/src/remmina_protocol_widget.c:227 #, c-format msgid "Protocol plugin %s is not installed." -msgstr "Protokoludvidelsesmodulet %s er ikke installeret." +msgstr "Protokol-pluginet %s er ikke installeret." #: remmina/src/remmina_protocol_widget.c:266 msgid "Open Secure Shell in New Terminal..." -msgstr "Åben Secure Shell i en Ny Terminal..." +msgstr "Åbn sikker skal i en ny terminal..." #: remmina/src/remmina_protocol_widget.c:272 msgid "Open Secure File Transfer..." -msgstr "Åben Secure File Transfer..." +msgstr "Åbn sikker filoverførsel..." #: remmina/src/remmina_protocol_widget.c:603 #, c-format msgid "Connecting to SSH server %s..." -msgstr "Tilslutter SSH server %s..." +msgstr "Opretter forbindelse til SSH-serveren %s..." #: remmina/src/remmina_protocol_widget.c:674 #: remmina/src/remmina_protocol_widget.c:842 #, c-format msgid "Connecting to %s through SSH tunnel..." -msgstr "Tilslutter %s gennem SSH tunnel..." +msgstr "Opretter forbindelse til %s gennem SSH-tunnel..." #: remmina/src/remmina_protocol_widget.c:716 #, c-format msgid "Waiting for an incoming SSH tunnel at port %i..." -msgstr "Venter på en indgående SSH tunnel på port %i..." +msgstr "Venter på en indgående SSH-tunnel på port %i..." #: remmina/src/remmina_protocol_widget.c:764 #, c-format msgid "Command %s not found on SSH server" -msgstr "Kommando %s ikke fundet på SSH server" +msgstr "Kommandoen %s ikke fundet på SSH-server" #: remmina/src/remmina_protocol_widget.c:768 #, c-format msgid "Command %s failed on SSH server (status = %i)." -msgstr "Kommando %s fejlede på SSH server (status = %i)." +msgstr "Kommandoen %s mislykkedes på SSH-server (status = %i)." #: remmina/src/remmina_protocol_widget.c:779 #, c-format @@ -1046,225 +1050,225 @@ msgstr "%s adgangskode" #: remmina/src/remmina_protocol_widget.c:1169 #, c-format msgid "Listening on port %i for an incoming %s connection..." -msgstr "Lytter på port %i efter en indgående %s forbindelse..." +msgstr "Lytter på port %i efter en indgående %s-forbindelse..." #: remmina/src/remmina_protocol_widget.c:1177 msgid "Authentication failed. Trying to reconnect..." -msgstr "Godkendelse mislykkedes. Forsøger at tilslutte igen..." +msgstr "Autentifikation mislykkedes. Prøver at oprette forbindelse igen..." #: remmina-plugins/xdmcp/xdmcp_plugin.c:99 msgid "Run out of available local X display number." -msgstr "" +msgstr "Løb tør for tilgængelige tal til lokalt X-display." #: remmina-plugins/xdmcp/xdmcp_plugin.c:286 remmina-plugins/nx/nx_plugin.c:629 #, c-format msgid "Protocol %s is unavailable because GtkSocket only works under Xorg" -msgstr "" +msgstr "Protokollen %s er utilgængelig eftersom GtkSocket kun virker under Xorg" #: remmina-plugins/xdmcp/xdmcp_plugin.c:382 msgid "Grayscale" -msgstr "" +msgstr "Gråtone" #: remmina-plugins/xdmcp/xdmcp_plugin.c:383 msgid "256 colors" -msgstr "" +msgstr "256 farver" #: remmina-plugins/xdmcp/xdmcp_plugin.c:384 msgid "High color (16 bit)" -msgstr "" +msgstr "Mange farver (16 bit)" #: remmina-plugins/xdmcp/xdmcp_plugin.c:385 msgid "True color (24 bit)" -msgstr "" +msgstr "Ægte farver (24 bit)" #: remmina-plugins/xdmcp/xdmcp_plugin.c:402 #: remmina-plugins/rdp/rdp_plugin.c:1371 remmina-plugins/vnc/vnc_plugin.c:1990 #: remmina-plugins/vnc/vnc_plugin.c:2010 msgid "Color depth" -msgstr "" +msgstr "Farvedybde" #: remmina-plugins/xdmcp/xdmcp_plugin.c:404 remmina-plugins/nx/nx_plugin.c:781 msgid "Use local cursor" -msgstr "" +msgstr "Brug lokal markør" #: remmina-plugins/xdmcp/xdmcp_plugin.c:405 msgid "Disconnect after one session" -msgstr "" +msgstr "Afbryd forbindelsen efter én session" #: remmina-plugins/xdmcp/xdmcp_plugin.c:406 msgid "Listening connection on protocol TCP" -msgstr "" +msgstr "Lytteforbindelse på protokol TCP" #: remmina-plugins/xdmcp/xdmcp_plugin.c:414 #: remmina-plugins/spice/spice_plugin.c:465 remmina-plugins/nx/nx_plugin.c:790 #: remmina-plugins/rdp/rdp_plugin.c:1416 remmina-plugins/vnc/vnc_plugin.c:2045 msgid "Send Ctrl+Alt+Delete" -msgstr "" +msgstr "Send Ctrl+Alt+Delete" #: remmina-plugins/xdmcp/xdmcp_plugin.c:423 msgid "XDMCP - X Remote Session" -msgstr "" +msgstr "XDMCP - X-fjernsession" #: remmina-plugins/spice/spice_plugin_usb.c:51 #: remmina-plugins/spice/spice_plugin.c:466 msgid "Select USB devices for redirection" -msgstr "" +msgstr "Vælg USB-enheder til viderestilling" #: remmina-plugins/spice/spice_plugin_usb.c:54 msgid "_Close" -msgstr "" +msgstr "_Luk" #: remmina-plugins/spice/spice_plugin_usb.c:95 msgid "USB redirection error" -msgstr "" +msgstr "Fejl ved viderestilling af USB" #: remmina-plugins/spice/spice_plugin_file_transfer.c:84 msgid "File Transfers" -msgstr "" +msgstr "Filoverførsler" #: remmina-plugins/spice/spice_plugin_file_transfer.c:225 msgid "Transfer error" -msgstr "" +msgstr "Overførselsfejl" #: remmina-plugins/spice/spice_plugin_file_transfer.c:226 #, c-format msgid "%s: %s" -msgstr "" +msgstr "%s: %s" #: remmina-plugins/spice/spice_plugin_file_transfer.c:231 msgid "Transfer completed" -msgstr "" +msgstr "Overførsel fuldført" #: remmina-plugins/spice/spice_plugin_file_transfer.c:232 #, c-format msgid "File %s transferred successfully" -msgstr "" +msgstr "Filen %s blev overført" #: remmina-plugins/spice/spice_plugin.c:262 #, c-format msgid "Disconnected from SPICE server %s." -msgstr "" +msgstr "Forbindelsen til SPICE-serveren %s blev afbrudt." #: remmina-plugins/spice/spice_plugin.c:275 msgid "Invalid password." -msgstr "" +msgstr "Ugyldig adgangskode." #: remmina-plugins/spice/spice_plugin.c:280 msgid "TLS connection error." -msgstr "" +msgstr "Fejl ved TLS-forbindelse." #: remmina-plugins/spice/spice_plugin.c:286 msgid "Connection to SPICE server failed." -msgstr "" +msgstr "Forbindelse til SPICE-server mislykkedes." #: remmina-plugins/spice/spice_plugin.c:433 #: remmina-plugins/spice/spice_plugin.c:463 msgid "Resize guest to match window size" -msgstr "" +msgstr "Tilpas gæst til vinduets størrelse" #: remmina-plugins/spice/spice_plugin.c:434 msgid "Use TLS encryption" -msgstr "" +msgstr "Brug TLS-kryptering" #: remmina-plugins/spice/spice_plugin.c:435 msgid "Server CA certificate" -msgstr "" +msgstr "Serverens CA-certifikat" #: remmina-plugins/spice/spice_plugin.c:450 #: remmina-plugins/spice/spice_plugin.c:462 #: remmina-plugins/vnc/vnc_plugin.c:2028 remmina-plugins/vnc/vnc_plugin.c:2041 msgid "View only" -msgstr "" +msgstr "Kun visning" #: remmina-plugins/spice/spice_plugin.c:451 #: remmina-plugins/spice/spice_plugin.c:464 remmina-plugins/nx/nx_plugin.c:779 #: remmina-plugins/rdp/rdp_plugin.c:1404 remmina-plugins/vnc/vnc_plugin.c:2029 msgid "Disable clipboard sync" -msgstr "" +msgstr "Deaktivér synkronisering af udklipsholder" #: remmina-plugins/spice/spice_plugin.c:452 remmina-plugins/nx/nx_plugin.c:782 #: remmina-plugins/rdp/rdp_plugin.c:1403 remmina-plugins/vnc/vnc_plugin.c:2032 msgid "Disable password storing" -msgstr "" +msgstr "Deaktivér lagring af adgangskode" #: remmina-plugins/spice/spice_plugin.c:453 msgid "Enable audio channel" -msgstr "" +msgstr "Aktivér lydkanal" #: remmina-plugins/spice/spice_plugin.c:454 #: remmina-plugins/rdp/rdp_plugin.c:1401 msgid "Share smartcard" -msgstr "" +msgstr "Del smartcart" #: remmina-plugins/spice/spice_plugin.c:475 msgid "SPICE - Simple Protocol for Independent Computing Environments" -msgstr "" +msgstr "SPICE - Simple Protocol for Independent Computing Environments" #: remmina-plugins/nx/nx_session_manager.c:106 msgid "Terminating" -msgstr "" +msgstr "Afslutter" #: remmina-plugins/nx/nx_session_manager.c:155 #, c-format msgid "NX Sessions on %s" -msgstr "" +msgstr "NX-sessioner på %s" #: remmina-plugins/nx/nx_session_manager.c:160 msgid "Attach" -msgstr "" +msgstr "Tilkobl" #: remmina-plugins/nx/nx_session_manager.c:166 msgid "Restore" -msgstr "" +msgstr "Gendan" #: remmina-plugins/nx/nx_session_manager.c:167 msgid "Start" -msgstr "" +msgstr "Start" #: remmina-plugins/nx/nx_session_manager.c:173 msgid "Terminate" -msgstr "" +msgstr "Afslut" #: remmina-plugins/nx/nx_session_manager.c:205 msgid "Display" -msgstr "" +msgstr "Vis" #: remmina-plugins/nx/nx_session_manager.c:212 msgid "Status" -msgstr "" +msgstr "Status" #: remmina-plugins/nx/nx_plugin.c:740 remmina-plugins/rdp/rdp_plugin.c:1326 #: remmina-plugins/rdp/rdp_settings.c:274 remmina-plugins/vnc/vnc_plugin.c:1968 msgid "Poor (fastest)" -msgstr "" +msgstr "Dårlig (hurtigst)" #: remmina-plugins/nx/nx_plugin.c:741 remmina-plugins/rdp/rdp_plugin.c:1327 #: remmina-plugins/rdp/rdp_settings.c:276 remmina-plugins/vnc/vnc_plugin.c:1969 msgid "Medium" -msgstr "" +msgstr "Medium" #: remmina-plugins/nx/nx_plugin.c:742 remmina-plugins/rdp/rdp_plugin.c:1328 #: remmina-plugins/rdp/rdp_settings.c:278 remmina-plugins/vnc/vnc_plugin.c:1970 msgid "Good" -msgstr "" +msgstr "God" #: remmina-plugins/nx/nx_plugin.c:743 remmina-plugins/rdp/rdp_plugin.c:1329 #: remmina-plugins/rdp/rdp_settings.c:280 remmina-plugins/vnc/vnc_plugin.c:1971 msgid "Best (slowest)" -msgstr "" +msgstr "Bedste (langsomst)" #: remmina-plugins/nx/nx_plugin.c:763 remmina-plugins/rdp/rdp_plugin.c:1388 #: remmina-plugins/vnc/vnc_plugin.c:1991 remmina-plugins/vnc/vnc_plugin.c:2011 msgid "Quality" -msgstr "" +msgstr "Kvalitet" #: remmina-plugins/nx/nx_plugin.c:780 remmina-plugins/vnc/vnc_plugin.c:2030 msgid "Disable encryption" -msgstr "" +msgstr "Deaktivér kryptering" #: remmina-plugins/nx/nx_plugin.c:799 msgid "NX - NX Technology" -msgstr "" +msgstr "NX - NX-teknologi" #: remmina-plugins/rdp/rdp_plugin.c:1029 #, c-format @@ -1272,6 +1276,8 @@ msgid "" "Authentication to RDP server %s failed.\n" "Check username, password and domain." msgstr "" +"Autentifikation til RDP-serveren %s mislykkedes.\n" +"Tjek brugernavn, adgangskode og domæne." #: remmina-plugins/rdp/rdp_plugin.c:1035 #, c-format @@ -1279,6 +1285,8 @@ msgid "" "Access to RDP server %s failed.\n" "Account is locked out." msgstr "" +"Adgang til RDP-serveren %s mislykkedes.\n" +"Kontoen er låst." #: remmina-plugins/rdp/rdp_plugin.c:1039 #, c-format @@ -1286,6 +1294,8 @@ msgid "" "Access to RDP server %s failed.\n" "Account is expired." msgstr "" +"Adgang til RDP-serveren %s mislykkedes.\n" +"Kontoen er udløbet." #: remmina-plugins/rdp/rdp_plugin.c:1043 #, c-format @@ -1293,6 +1303,8 @@ msgid "" "Access to RDP server %s failed.\n" "Password expired." msgstr "" +"Adgang til RDP-serveren %s mislykkedes.\n" +"Adgangskoden er udløbet." #: remmina-plugins/rdp/rdp_plugin.c:1047 #, c-format @@ -1300,6 +1312,8 @@ msgid "" "Access to RDP server %s failed.\n" "Account is disabled." msgstr "" +"Adgang til RDP-serveren %s mislykkedes.\n" +"Kontoen er deaktiveret." #: remmina-plugins/rdp/rdp_plugin.c:1051 #, c-format @@ -1307,277 +1321,279 @@ msgid "" "Access to RDP server %s failed.\n" "Account has restrictions." msgstr "" +"Adgang til RDP-serveren %s mislykkedes.\n" +"Kontoen har begrænsninger." #: remmina-plugins/rdp/rdp_plugin.c:1055 #, c-format msgid "Connection to RDP server %s failed." -msgstr "" +msgstr "Forbindelsen til RDP-serveren %s mislykkedes." #: remmina-plugins/rdp/rdp_plugin.c:1058 #, c-format msgid "Unable to find the address of RDP server %s." -msgstr "" +msgstr "Kan ikke finde adressen for RDP-serveren %s." #: remmina-plugins/rdp/rdp_plugin.c:1061 #, c-format msgid "Unable to connect to RDP server %s" -msgstr "" +msgstr "Kan ikke oprette forbindelse til RDP-serveren %s" #: remmina-plugins/rdp/rdp_plugin.c:1314 remmina-plugins/vnc/vnc_plugin.c:1957 msgid "256 colors (8 bpp)" -msgstr "" +msgstr "256 farver (8 bpp)" #: remmina-plugins/rdp/rdp_plugin.c:1315 remmina-plugins/vnc/vnc_plugin.c:1958 msgid "High color (15 bpp)" -msgstr "" +msgstr "Mange farver (15 bpp)" #: remmina-plugins/rdp/rdp_plugin.c:1316 remmina-plugins/vnc/vnc_plugin.c:1959 msgid "High color (16 bpp)" -msgstr "" +msgstr "Mange farver (16 bpp)" #: remmina-plugins/rdp/rdp_plugin.c:1317 remmina-plugins/vnc/vnc_plugin.c:1960 msgid "True color (24 bpp)" -msgstr "" +msgstr "Ægte farver (24 bpp)" #: remmina-plugins/rdp/rdp_plugin.c:1318 remmina-plugins/vnc/vnc_plugin.c:1961 msgid "True color (32 bpp)" -msgstr "" +msgstr "Ægte farver (32 bpp)" #: remmina-plugins/rdp/rdp_plugin.c:1319 msgid "RemoteFX (32 bpp)" -msgstr "" +msgstr "RemoteFX (32 bpp)" #: remmina-plugins/rdp/rdp_plugin.c:1336 msgid "Off" -msgstr "" +msgstr "Fra" #: remmina-plugins/rdp/rdp_plugin.c:1338 msgid "Local - low quality" -msgstr "" +msgstr "Lokal - lav kvalitet" #: remmina-plugins/rdp/rdp_plugin.c:1339 msgid "Local - medium quality" -msgstr "" +msgstr "Lokal - medium kvalitet" #: remmina-plugins/rdp/rdp_plugin.c:1340 msgid "Local - high quality" -msgstr "" +msgstr "Lokal - høj kvalitet" #: remmina-plugins/rdp/rdp_plugin.c:1348 msgid "Negotiate" -msgstr "" +msgstr "Forhandl" #: remmina-plugins/rdp/rdp_plugin.c:1372 msgid "Share folder" -msgstr "" +msgstr "Delingsmappe" #: remmina-plugins/rdp/rdp_plugin.c:1373 msgid "Disable automatic reconnection" -msgstr "" +msgstr "Deaktivér automatisk genoprettelse af forbindelsen" #: remmina-plugins/rdp/rdp_plugin.c:1389 msgid "Sound" -msgstr "" +msgstr "Lyd" #: remmina-plugins/rdp/rdp_plugin.c:1390 msgid "Security" -msgstr "" +msgstr "Sikkerhed" #: remmina-plugins/rdp/rdp_plugin.c:1391 msgid "RD Gateway server" -msgstr "" +msgstr "RD-gateway server" #: remmina-plugins/rdp/rdp_plugin.c:1392 msgid "RD Gateway username" -msgstr "" +msgstr "RD-gateway brugernavn" #: remmina-plugins/rdp/rdp_plugin.c:1393 msgid "RD Gateway password" -msgstr "" +msgstr "RD-gateway adgangskode" #: remmina-plugins/rdp/rdp_plugin.c:1394 msgid "RD Gateway domain" -msgstr "" +msgstr "RD-gateway domæne" #: remmina-plugins/rdp/rdp_plugin.c:1395 msgid "Client name" -msgstr "" +msgstr "Klientnavn" #: remmina-plugins/rdp/rdp_plugin.c:1398 msgid "Load Balance Info" -msgstr "" +msgstr "Information om balancering af belastning" #: remmina-plugins/rdp/rdp_plugin.c:1399 msgid "Ignore certificate" -msgstr "" +msgstr "Ignorer certifikat" #: remmina-plugins/rdp/rdp_plugin.c:1400 msgid "Redirect local microphone" -msgstr "" +msgstr "Omdiriger lokal mikrofon" #: remmina-plugins/rdp/rdp_plugin.c:1402 msgid "Share local printers" -msgstr "" +msgstr "Del lokale printere" #: remmina-plugins/rdp/rdp_plugin.c:1405 msgid "Attach to console (2003/2003 R2)" -msgstr "" +msgstr "Kobl til konsol (2003/2003 R2)" #: remmina-plugins/rdp/rdp_plugin.c:1406 msgid "Server detection using RD Gateway" -msgstr "" +msgstr "Serverregistrering bruger RD-gateway" #: remmina-plugins/rdp/rdp_plugin.c:1426 msgid "RDP - Remote Desktop Protocol" -msgstr "" +msgstr "RDP - Remote Desktop Protocol" #: remmina-plugins/rdp/rdp_plugin.c:1449 msgid "RDP - RDP File Handler" -msgstr "" +msgstr "RDP - RDP-filhåndterer" #: remmina-plugins/rdp/rdp_plugin.c:1464 msgid "RDP - Preferences" -msgstr "" +msgstr "RDP - Præferencer" #: remmina-plugins/rdp/rdp_plugin.c:1497 msgid "Export connection in Windows .rdp file format" -msgstr "" +msgstr "Eksportér forbindelse i Windows .rdp-filformat" #: remmina-plugins/rdp/rdp_settings.c:204 msgid "<Auto detect>" -msgstr "" +msgstr "<automatisk registrering>" #: remmina-plugins/rdp/rdp_settings.c:238 msgid "<Not set>" -msgstr "" +msgstr "<ikke sat>" #: remmina-plugins/rdp/rdp_settings.c:272 msgid "<Choose a quality level to edit...>" -msgstr "" +msgstr "<vælg et kvalitetsniveau for at redigere...>" #: remmina-plugins/rdp/rdp_settings.c:433 msgid "Keyboard layout" -msgstr "" +msgstr "Tastaturlayout" #: remmina-plugins/rdp/rdp_settings.c:458 msgid "Use client keyboard mapping" -msgstr "" +msgstr "Brug klients tastaturkortlægning" #: remmina-plugins/rdp/rdp_settings.c:468 msgid "Quality settings" -msgstr "" +msgstr "Kvalitetsindstillinger" #: remmina-plugins/rdp/rdp_settings.c:488 msgid "Wallpaper" -msgstr "" +msgstr "Tapet" #: remmina-plugins/rdp/rdp_settings.c:495 msgid "Window drag" -msgstr "" +msgstr "Vinduestræk" #: remmina-plugins/rdp/rdp_settings.c:502 msgid "Menu animation" -msgstr "" +msgstr "Menuanimation" #: remmina-plugins/rdp/rdp_settings.c:509 msgid "Theme" -msgstr "" +msgstr "Tema" #: remmina-plugins/rdp/rdp_settings.c:516 msgid "Cursor shadow" -msgstr "" +msgstr "Markørskygge" #: remmina-plugins/rdp/rdp_settings.c:523 msgid "Cursor blinking" -msgstr "" +msgstr "Markørblink" #: remmina-plugins/rdp/rdp_settings.c:530 msgid "Font smoothing" -msgstr "" +msgstr "Udjævning af skrifttype" #: remmina-plugins/rdp/rdp_settings.c:537 msgid "Composition" -msgstr "" +msgstr "Komposition" #: remmina-plugins/rdp/rdp_settings.c:547 msgid "Remote scale factor" -msgstr "" +msgstr "Fjernskaleringsfaktor" #: remmina-plugins/rdp/rdp_settings.c:560 msgid "Desktop scale factor %" -msgstr "" +msgstr "Skaleringsfaktor for skrivebord %" #: remmina-plugins/rdp/rdp_settings.c:571 msgid "Device scale factor %" -msgstr "" +msgstr "Skaleringsfaktor for enhed %" #: remmina-plugins/rdp/rdp_settings.c:593 msgid "Desktop orientation" -msgstr "" +msgstr "Orientering af skrivebord" #: remmina-plugins/rdp/rdp_event.c:297 #, c-format msgid "Reconnection in progress. Attempt %d of %d..." -msgstr "" +msgstr "Genoprettelse af forbindelse i gang. Forsøg %d af %d..." #: remmina-plugins/vnc/vnc_plugin.c:1018 msgid "Unable to connect to VNC server" -msgstr "" +msgstr "Kan ikke oprette forbindelse til VNC-server" #: remmina-plugins/vnc/vnc_plugin.c:1019 #, c-format msgid "Couldn't convert '%s' to host address" -msgstr "" +msgstr "Kunne ikke konvertere '%s' til værtsadresse" #: remmina-plugins/vnc/vnc_plugin.c:1020 #, c-format msgid "VNC connection failed: %s" -msgstr "" +msgstr "VNC-forbindelse mislykkedes: %s" #: remmina-plugins/vnc/vnc_plugin.c:1021 msgid "Your connection has been rejected." -msgstr "" +msgstr "Din forbindelse er blevet afvist." #: remmina-plugins/vnc/vnc_plugin.c:1048 #, c-format msgid "Unknown authentication scheme from VNC server: %s" -msgstr "" +msgstr "Ukendt autentifikationsskema fra VNC-server: %s" #: remmina-plugins/vnc/vnc_plugin.c:1050 msgid "Please retry after enabling encryption on this profile." -msgstr "" +msgstr "Prøv venligst igen når kryptering er blevet aktiveret på denne profil." #: remmina-plugins/vnc/vnc_plugin.c:1987 msgid "Repeater" -msgstr "" +msgstr "Repeater" #: remmina-plugins/vnc/vnc_plugin.c:2007 msgid "Listen on port" -msgstr "" +msgstr "Lyt på port" #: remmina-plugins/vnc/vnc_plugin.c:2027 msgid "Show remote cursor" -msgstr "" +msgstr "Vis fjernmarkør" #: remmina-plugins/vnc/vnc_plugin.c:2031 remmina-plugins/vnc/vnc_plugin.c:2042 msgid "Disable server input" -msgstr "" +msgstr "Deaktivér serverinput" #: remmina-plugins/vnc/vnc_plugin.c:2044 msgid "Open Chat..." -msgstr "" +msgstr "Åbn chat..." #: remmina-plugins/vnc/vnc_plugin.c:2056 msgid "VNC - Virtual Network Computing" -msgstr "" +msgstr "VNC - Virtual Network Computing" #: remmina-plugins/vnc/vnc_plugin.c:2078 msgid "VNC - Incoming Connection" -msgstr "" +msgstr "VNC - Indgående forbindelse" #: remmina-plugins/telepathy/telepathy_plugin.c:57 msgid "Telepathy - Desktop Sharing" -msgstr "" +msgstr "Telepathy - Skrivebordsdeling" #: remmina-plugins/telepathy/telepathy_channel_handler.c:255 #, c-format @@ -1585,124 +1601,126 @@ msgid "" "%s wants to share his/her desktop.\n" "Do you accept the invitation?" msgstr "" +"%s vil dele hans/hendes skrivebord.\n" +"Vil du acceptere denne invitation?" #: remmina-plugins/telepathy/telepathy_channel_handler.c:258 msgid "Desktop sharing invitation" -msgstr "" +msgstr "Invitation til skrivebordsdeling" #: remmina/ui/remmina_main.glade:44 msgid "Open the preferences dialog" -msgstr "" +msgstr "Åbn præferencer-dialogen" #: remmina/ui/remmina_main.glade:68 remmina/ui/remmina_main.glade:473 msgid "Multi password changer" -msgstr "" +msgstr "Multi-adgangskodeskifter" #: remmina/ui/remmina_main.glade:69 msgid "MPChange" -msgstr "" +msgstr "MASkift" #: remmina/ui/remmina_main.glade:80 msgid "Open the connection to the selected remote desktop file" -msgstr "" +msgstr "Åbn forbindelsen til den valgte fjernskrivebordsfil" #: remmina/ui/remmina_main.glade:89 remmina/ui/remmina_main.glade:90 msgid "_Edit" -msgstr "" +msgstr "_Rediger" #: remmina/ui/remmina_main.glade:91 msgid "Edit the selected remote desktop file" -msgstr "" +msgstr "Rediger den valgte fjernskrivebordsfil" #: remmina/ui/remmina_main.glade:101 msgid "Create a copy of the selected remote desktop file" -msgstr "" +msgstr "Open en kopi af den valgte fjernskrivebordsfil" #: remmina/ui/remmina_main.glade:111 msgid "Delete the selected remote desktop file" -msgstr "" +msgstr "Slet den valgte fjernskrivebordsfil" #: remmina/ui/remmina_main.glade:119 remmina/ui/remmina_main.glade:120 msgid "External Tools" -msgstr "" +msgstr "Eksterne værktøjer" #: remmina/ui/remmina_main.glade:131 remmina/ui/remmina_main.glade:132 msgid "_New" -msgstr "" +msgstr "_Ny" #: remmina/ui/remmina_main.glade:133 msgid "Create a new remote desktop file" -msgstr "" +msgstr "Opret en ny fjernskrivebordsfil" #: remmina/ui/remmina_main.glade:145 remmina/ui/remmina_main.glade:146 #: remmina/ui/remmina_main.glade:545 msgid "Homepage" -msgstr "" +msgstr "Hjemmeside" #: remmina/ui/remmina_main.glade:152 remmina/ui/remmina_main.glade:153 #: remmina/ui/remmina_main.glade:555 msgid "Online Wiki" -msgstr "" +msgstr "Online-wiki" #: remmina/ui/remmina_main.glade:160 remmina/ui/remmina_main.glade:161 #: remmina/ui/remmina_main.glade:564 msgid "G+ Remmina Community" -msgstr "" +msgstr "G+ Remmina-fællesskab" #: remmina/ui/remmina_main.glade:167 remmina/ui/remmina_main.glade:168 #: remmina/ui/remmina_main.glade:573 msgid "Donations" -msgstr "" +msgstr "Donationer" #: remmina/ui/remmina_main.glade:174 remmina/ui/remmina_main.glade:175 #: remmina/ui/remmina_main.glade:583 msgid "Debug Window" -msgstr "" +msgstr "Fejlretningsvindue" #: remmina/ui/remmina_main.glade:192 remmina/ui/remmina_main.glade:193 #: remmina/ui/remmina_main.glade:453 msgid "Export" -msgstr "" +msgstr "Eksportér" #: remmina/ui/remmina_main.glade:202 remmina/ui/remmina_main.glade:203 msgid "Statusbar" -msgstr "" +msgstr "Statuslinje" #: remmina/ui/remmina_main.glade:210 remmina/ui/remmina_main.glade:211 msgid "List View" -msgstr "" +msgstr "Listevisning" #: remmina/ui/remmina_main.glade:219 remmina/ui/remmina_main.glade:220 msgid "Tree View" -msgstr "" +msgstr "Trævisning" #: remmina/ui/remmina_main.glade:291 msgid "search string or server name/ip address for quick connect" -msgstr "" +msgstr "søg efter streng eller servernavn/IP-adresse for hurtig forbindelse" #: remmina/ui/remmina_main.glade:296 msgid "Server name or IP address" -msgstr "" +msgstr "Servernavn eller IP-adresse" #: remmina/ui/remmina_main.glade:297 remmina/ui/remmina_preferences.glade:220 msgid "Clear" -msgstr "" +msgstr "Ryd" #: remmina/ui/remmina_main.glade:342 msgid "Actions" -msgstr "" +msgstr "Handlinger" #: remmina/ui/remmina_main.glade:692 msgid "Last time used" -msgstr "" +msgstr "Sidst brugt" #: remmina/ui/remmina_about.glade:30 msgid "About Remmina" -msgstr "" +msgstr "Om Remmina" #: remmina/ui/remmina_about.glade:40 msgid "Remmina Web Site" -msgstr "" +msgstr "Remmina-websted" #: remmina/ui/remmina_about.glade:117 msgid "" @@ -1717,6 +1735,16 @@ msgid "" "llyzs <llyzs.vic@gmail.com>\n" "Johannes Weberhofer <jweberhofer@weberhofer.at>\n" msgstr "" +"Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n" +"Antenore Gatta <antenore@simbiosi.org>\n" +"Emmanuel Grognet <emmanuel@grognet.fr>\n" +"Giovanni Panozzo <giovanni@panozzo.it>\n" +"Jean-Louis Dupond <jean-louis@dupond.be>\n" +"Jose Gregorio Jimenez Sanchez <josegjimenez@gmail.com>\n" +"Fabio Castelli (muflone) <muflone@vbsimple.net>\n" +"Shuhrat Dehkanov <k@efir.uz>\n" +"llyzs <llyzs.vic@gmail.com>\n" +"Johannes Weberhofer <jweberhofer@weberhofer.at>\n" #: remmina/ui/remmina_preferences.glade:33 #: remmina/ui/remmina_preferences.glade:34 @@ -1725,387 +1753,387 @@ msgstr "" #: remmina/ui/remmina_string_list.glade:9 #: remmina/ui/remmina_string_list.glade:63 msgid "Close" -msgstr "" +msgstr "Luk" #: remmina/ui/remmina_preferences.glade:41 msgid "Remmina Preferences" -msgstr "" +msgstr "Remmina-præferencer" #: remmina/ui/remmina_preferences.glade:99 msgid "Remember last view mode for each connection" -msgstr "" +msgstr "Husk sidste visningstilstand for hver forbindelse" #: remmina/ui/remmina_preferences.glade:116 msgid "Double-click action" -msgstr "" +msgstr "Handling for dobbeltklik" #: remmina/ui/remmina_preferences.glade:130 msgid "Open connection" -msgstr "" +msgstr "Åbn forbindelse" #: remmina/ui/remmina_preferences.glade:131 msgid "Edit settings" -msgstr "" +msgstr "Rediger indstillinger" #: remmina/ui/remmina_preferences.glade:144 msgid "Scale quality" -msgstr "" +msgstr "Skaleringskvalitet" #: remmina/ui/remmina_preferences.glade:158 msgid "Nearest" -msgstr "" +msgstr "Nærmeste" #: remmina/ui/remmina_preferences.glade:159 msgid "Tiles" -msgstr "" +msgstr "Fliser" #: remmina/ui/remmina_preferences.glade:160 msgid "Bilinear" -msgstr "" +msgstr "Bilineær" #: remmina/ui/remmina_preferences.glade:161 msgid "Hyper" -msgstr "" +msgstr "Hyper" #: remmina/ui/remmina_preferences.glade:174 msgid "Auto scroll step size" -msgstr "" +msgstr "Trinstørrelse for automatisk rulning" #: remmina/ui/remmina_preferences.glade:198 msgid "Maximum recent items" -msgstr "" +msgstr "Maksimum elementer i seneste" #: remmina/ui/remmina_preferences.glade:245 msgid "Configure resolutions" -msgstr "" +msgstr "Konfigurer opløsninger" #: remmina/ui/remmina_preferences.glade:287 msgid "Screenshots folder" -msgstr "" +msgstr "Mappe til skærmbilleder" #: remmina/ui/remmina_preferences.glade:299 msgid "Choose the directory where you want to save Remmina screenshots." -msgstr "" +msgstr "Vælg mappen hvor Remmina skal gemme skærmbilleder." #: remmina/ui/remmina_preferences.glade:302 msgid "Select a Directory" -msgstr "" +msgstr "Vælg en mappe" #: remmina/ui/remmina_preferences.glade:330 msgid "Options" -msgstr "" +msgstr "Valgmuligheder" #: remmina/ui/remmina_preferences.glade:352 msgid "Always show tabs" -msgstr "" +msgstr "Vis altid faneblade" #: remmina/ui/remmina_preferences.glade:367 msgid "Hide toolbar in tabbed interface" -msgstr "" +msgstr "Skjul værktøjslinje i grænseflade med faneblade" #: remmina/ui/remmina_preferences.glade:384 msgid "Default view mode" -msgstr "" +msgstr "Standard visningstilstand" #: remmina/ui/remmina_preferences.glade:398 msgid "Automatic" -msgstr "" +msgstr "Automatisk" #: remmina/ui/remmina_preferences.glade:399 msgid "Scrolled window" -msgstr "" +msgstr "Rullet vindue" #: remmina/ui/remmina_preferences.glade:400 msgid "Scrolled fullscreen" -msgstr "" +msgstr "Rullet fuldskærm" #: remmina/ui/remmina_preferences.glade:401 msgid "Viewport fullscreen" -msgstr "" +msgstr "Viewport fuldskærm" #: remmina/ui/remmina_preferences.glade:414 msgid "Tab interface" -msgstr "" +msgstr "Grænseflade med faneblade" #: remmina/ui/remmina_preferences.glade:428 msgid "Tab by groups" -msgstr "" +msgstr "Faneblad efter grupper" #: remmina/ui/remmina_preferences.glade:429 msgid "Tab by protocols" -msgstr "" +msgstr "Faneblad efter protokoller" #: remmina/ui/remmina_preferences.glade:430 msgid "Tab all connections" -msgstr "" +msgstr "Faneblad for alle forbindelser" #: remmina/ui/remmina_preferences.glade:431 msgid "Do not use tabs" -msgstr "" +msgstr "Brug ikke faneblade" #: remmina/ui/remmina_preferences.glade:444 msgid "Show buttons icons" -msgstr "" +msgstr "Vis knappers ikoner" #: remmina/ui/remmina_preferences.glade:457 #: remmina/ui/remmina_preferences.glade:487 msgid "This setting will be active after the application restart" -msgstr "" +msgstr "Denne indstilling vil være aktiv efter programmet er blevet genstartet" #: remmina/ui/remmina_preferences.glade:460 #: remmina/ui/remmina_preferences.glade:490 msgid "Use system theme preferences" -msgstr "" +msgstr "Brug systemets temapræferencer" #: remmina/ui/remmina_preferences.glade:461 #: remmina/ui/remmina_preferences.glade:491 msgid "Show always" -msgstr "" +msgstr "Vis altid" #: remmina/ui/remmina_preferences.glade:462 #: remmina/ui/remmina_preferences.glade:492 msgid "Hide always" -msgstr "" +msgstr "Skjul altid" #: remmina/ui/remmina_preferences.glade:475 msgid "Show menu icons" -msgstr "" +msgstr "Vis menuikoner" #: remmina/ui/remmina_preferences.glade:503 msgid "Fullscreen on the same monitor as the connection window" -msgstr "" +msgstr "Fuldskærm på den samme skærm som forbindelsesvinduet" #: remmina/ui/remmina_preferences.glade:523 msgid "Peeking" -msgstr "" +msgstr "Smugkig" #: remmina/ui/remmina_preferences.glade:524 msgid "Hidden" -msgstr "" +msgstr "Skjult" #: remmina/ui/remmina_preferences.glade:525 msgid "Disabled" -msgstr "" +msgstr "Deaktiveret" #: remmina/ui/remmina_preferences.glade:538 msgid "Fullscreen toolbar visibility" -msgstr "" +msgstr "Værktøjslinjens synlighed i fuldskærm" #: remmina/ui/remmina_preferences.glade:557 msgid "Appearance" -msgstr "" +msgstr "Udseende" #: remmina/ui/remmina_preferences.glade:580 msgid "Show new connection on top of the menu" -msgstr "" +msgstr "Vis ny forbindelse øverst i menuen" #: remmina/ui/remmina_preferences.glade:596 msgid "Hide total count in group menu" -msgstr "" +msgstr "Skjul total-tælling i gruppemenu" #: remmina/ui/remmina_preferences.glade:612 msgid "Disable tray icon" -msgstr "" +msgstr "Deaktivér bakkeikon" #: remmina/ui/remmina_preferences.glade:629 msgid "Start Remmina in tray icon at user logon" -msgstr "" +msgstr "Start Remmina i bakkeikon når bruger logger på" #: remmina/ui/remmina_preferences.glade:645 msgid "Dark Tray Icon" -msgstr "" +msgstr "Mørkt bakkeikon" #: remmina/ui/remmina_preferences.glade:649 msgid "Choose this if your theme panel is light." -msgstr "" +msgstr "Vælg den her hvis dit temapanel er lyst." #: remmina/ui/remmina_preferences.glade:671 msgid "Applet" -msgstr "" +msgstr "Applet" #: remmina/ui/remmina_preferences.glade:697 msgid "Host key" -msgstr "" +msgstr "Værtstast" #: remmina/ui/remmina_preferences.glade:753 msgid "Auto-fit window" -msgstr "" +msgstr "Automatisk tilpasning af vindue" #: remmina/ui/remmina_preferences.glade:850 msgid "Grab keyboard" -msgstr "" +msgstr "Fang tastatur" #: remmina/ui/remmina_preferences.glade:934 msgid "Show / hide toolbar" -msgstr "" +msgstr "Vis/skjul værktøjslinje" #: remmina/ui/remmina_preferences.glade:973 msgid "SCREENSHOT" -msgstr "" +msgstr "SKÆRMBILLEDE" #: remmina/ui/remmina_preferences.glade:997 #: remmina/ui/remmina_preferences.glade:1190 msgid "Keyboard" -msgstr "" +msgstr "Tastatur" #: remmina/ui/remmina_preferences.glade:1022 msgid "SSH tunnel local port" -msgstr "" +msgstr "Lokal port for SSH-tunnel" #: remmina/ui/remmina_preferences.glade:1044 msgid "Parse ~/.ssh/config" -msgstr "" +msgstr "Fortolk ~/.ssh/config" #: remmina/ui/remmina_preferences.glade:1063 msgid "SSH_LOG_NOLOG" -msgstr "" +msgstr "SSH_LOG_INGENLOG" #: remmina/ui/remmina_preferences.glade:1064 msgid "SSH_LOG_RARE" -msgstr "" +msgstr "SSH_LOG_SJÆLDEN" #: remmina/ui/remmina_preferences.glade:1065 msgid "SSH_LOG_ENTRY" -msgstr "" +msgstr "SSH_LOG_INDTASTNING" #: remmina/ui/remmina_preferences.glade:1066 msgid "SSH_LOG_PACKET" -msgstr "" +msgstr "SSH_LOG_PAKKE" #: remmina/ui/remmina_preferences.glade:1067 msgid "SSH_LOG_FUNCTIONS" -msgstr "" +msgstr "SSH_LOG_FUNKTIONER" #: remmina/ui/remmina_preferences.glade:1080 msgid "SSH log level" -msgstr "" +msgstr "SSH-logniveau" #: remmina/ui/remmina_preferences.glade:1099 msgid "SSH Options" -msgstr "" +msgstr "SSH-valgmuligheder" #: remmina/ui/remmina_preferences.glade:1125 msgid "Font" -msgstr "" +msgstr "Skrifttype" #: remmina/ui/remmina_preferences.glade:1138 msgid "Colors" -msgstr "" +msgstr "Farver" #: remmina/ui/remmina_preferences.glade:1151 #: remmina/ui/remmina_preferences.glade:1302 msgid "Foreground color" -msgstr "" +msgstr "Forgrundsfarve" #: remmina/ui/remmina_preferences.glade:1164 #: remmina/ui/remmina_preferences.glade:1316 msgid "Background color" -msgstr "" +msgstr "Baggrundsfarve" #: remmina/ui/remmina_preferences.glade:1177 msgid "Scrollback lines" -msgstr "" +msgstr "Tilbagerulningslinjer" #: remmina/ui/remmina_preferences.glade:1212 msgid "Use system default font" -msgstr "" +msgstr "Brug systemets standardskrifttype" #: remmina/ui/remmina_preferences.glade:1267 msgid "Allow bold text" -msgstr "" +msgstr "Tillad fed tekst" #: remmina/ui/remmina_preferences.glade:1283 msgid "Use system theme colors" -msgstr "" +msgstr "Brug systemets temafarver" #: remmina/ui/remmina_preferences.glade:1353 #: remmina/ui/remmina_preferences.glade:1392 #: remmina/ui/remmina_preferences.glade:1431 msgid "Host key +" -msgstr "" +msgstr "Værtstast +" #: remmina/ui/remmina_preferences.glade:1419 msgid "Select All" -msgstr "" +msgstr "Vælg alt" #: remmina/ui/remmina_preferences.glade:1474 msgid "Terminal" -msgstr "" +msgstr "Terminal" #: remmina/ui/remmina_spinner.glade:29 remmina/ui/remmina_key_chooser.glade:38 #: remmina/ui/remmina_key_chooser.glade:53 msgid "button" -msgstr "" +msgstr "knap" #: remmina/ui/remmina_spinner.glade:54 msgid "PLEASE WAIT ..." -msgstr "" +msgstr "VENT VENLIGST ..." #: remmina/ui/remmina_string_list.glade:14 #: remmina/ui/remmina_string_list.glade:158 msgid "Add" -msgstr "" +msgstr "Tilføj" #: remmina/ui/remmina_string_list.glade:20 #: remmina/ui/remmina_string_list.glade:137 msgid "Remove" -msgstr "" +msgstr "Fjern" #: remmina/ui/remmina_string_list.glade:26 #: remmina/ui/remmina_string_list.glade:116 msgid "Move up" -msgstr "" +msgstr "Flyt op" #: remmina/ui/remmina_string_list.glade:32 #: remmina/ui/remmina_string_list.glade:95 msgid "Move down" -msgstr "" +msgstr "Flyt ned" #: remmina/ui/remmina_key_chooser.glade:14 #: remmina/ui/remmina_key_chooser.glade:15 msgid "_Remove" -msgstr "" +msgstr "_Fjern" #: remmina/ui/remmina_key_chooser.glade:23 msgid "Choose a new key" -msgstr "" +msgstr "Vælg en ny tast" #: remmina/ui/remmina_key_chooser.glade:82 msgid "Please press the new key..." -msgstr "" +msgstr "Tryk venligst på en ny tast..." #: remmina/ui/remmina_mpc.glade:7 msgid "Remmina - Multi Password Changer" -msgstr "" +msgstr "Remmina - Multi-adgangskodeskifter" #: remmina/ui/remmina_mpc.glade:21 msgid "Change" -msgstr "" +msgstr "Skift" #: remmina/ui/remmina_mpc.glade:35 msgid "Cancel" -msgstr "" +msgstr "Annuller" #: remmina/ui/remmina_mpc.glade:61 msgid "<span weight='bold' size='larger'>Multi Password Changer</span>" -msgstr "" +msgstr "<span weight='bold' size='larger'>Multi-adgangskodeskifter</span>" #: remmina/ui/remmina_mpc.glade:166 msgid "Selection criteria" -msgstr "" +msgstr "Kriterie for valg" #: remmina/ui/remmina_mpc.glade:195 msgid "Confirm password" -msgstr "" +msgstr "Bekræft adgangskode" #: remmina/ui/remmina_mpc.glade:208 msgid "Reset to" -msgstr "" +msgstr "Nulstil til" #: remmina/ui/remmina_mpc.glade:302 msgid "F" -msgstr "" +msgstr "F" #: remmina/ui/remmina_mpc.glade:336 msgid "Domain\\Username" -msgstr "" +msgstr "Domæne\\brugernavn" diff --git a/remmina/src/remmina.c b/remmina/src/remmina.c index bd6c9936f..b1479c020 100644 --- a/remmina/src/remmina.c +++ b/remmina/src/remmina.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_about.c b/remmina/src/remmina_about.c index a0466377b..9d75b05d2 100644 --- a/remmina/src/remmina_about.c +++ b/remmina/src/remmina_about.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_about.h b/remmina/src/remmina_about.h index 399fd8c8f..40926bf04 100644 --- a/remmina/src/remmina_about.h +++ b/remmina/src/remmina_about.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_applet_menu.c b/remmina/src/remmina_applet_menu.c index 812c39d86..6e1a4e52c 100644 --- a/remmina/src/remmina_applet_menu.c +++ b/remmina/src/remmina_applet_menu.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -97,18 +98,11 @@ remmina_applet_menu_add_group(GtkWidget *menu, const gchar *group, gint position { TRACE_CALL("remmina_applet_menu_add_group"); GtkWidget *widget; - GtkWidget *image; GtkWidget *submenu; widget = gtk_menu_item_new_with_label(group); gtk_widget_show(widget); - image = - gtk_image_new_from_icon_name( - (menuitem->item_type == REMMINA_APPLET_MENU_ITEM_DISCOVERED ? - "folder-remote" : "folder"), GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - g_object_set_data_full(G_OBJECT(widget), "group", g_strdup(group), g_free); g_object_set_data(G_OBJECT(widget), "count", GINT_TO_POINTER(0)); if (groupmenuitem) @@ -245,6 +239,7 @@ void remmina_applet_menu_add_item(RemminaAppletMenu *menu, RemminaAppletMenuItem { gtk_menu_shell_append(GTK_MENU_SHELL(submenu), GTK_WIDGET(menuitem)); } + g_list_free(childs); remmina_applet_menu_register_item(menu, menuitem); } @@ -271,9 +266,11 @@ void remmina_applet_menu_populate(RemminaAppletMenu *menu) GtkWidget *menuitem; gchar filename[MAX_PATH_LEN]; GDir *dir; + gchar *remmina_data_dir; const gchar *name; - dir = g_dir_open(remmina_file_get_datadir(), 0, NULL); + remmina_data_dir = remmina_file_get_datadir(); + dir = g_dir_open(remmina_data_dir, 0, NULL); if (dir != NULL) { /* Iterate all remote desktop profiles */ @@ -281,7 +278,7 @@ void remmina_applet_menu_populate(RemminaAppletMenu *menu) { if (!g_str_has_suffix(name, ".remmina")) continue; - g_snprintf(filename, sizeof(filename), "%s/%s", remmina_file_get_datadir(), name); + g_snprintf(filename, sizeof(filename), "%s/%s", remmina_data_dir, name); menuitem = remmina_applet_menu_item_new(REMMINA_APPLET_MENU_ITEM_FILE, filename); if (menuitem != NULL) @@ -292,5 +289,6 @@ void remmina_applet_menu_populate(RemminaAppletMenu *menu) } g_dir_close(dir); } + g_free(remmina_data_dir); } diff --git a/remmina/src/remmina_applet_menu_item.c b/remmina/src/remmina_applet_menu_item.c index 6b225b57d..3affcd49f 100644 --- a/remmina/src/remmina_applet_menu_item.c +++ b/remmina/src/remmina_applet_menu_item.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -79,7 +80,6 @@ GtkWidget* remmina_applet_menu_item_new(RemminaAppletMenuItemType item_type, ... RemminaAppletMenuItem* item; GKeyFile* gkeyfile; GtkWidget* widget; - const gchar* iconname; va_start(ap, item_type); @@ -138,47 +138,6 @@ GtkWidget* remmina_applet_menu_item_new(RemminaAppletMenuItemType item_type, ... gtk_widget_set_halign (widget, GTK_ALIGN_START); gtk_container_add(GTK_CONTAINER(item), widget); - /* Create the image */ - - if (item_type == REMMINA_APPLET_MENU_ITEM_FILE || item_type == REMMINA_APPLET_MENU_ITEM_DISCOVERED) - { - if (g_strcmp0(item->protocol, "SFTP") == 0) - { - iconname = "remmina-sftp"; - } - else if (g_strcmp0(item->protocol, "SSH") == 0) - { - iconname = "utilities-terminal"; - } - else if (g_strcmp0(item->protocol, "RDP") == 0) - { - iconname = (item->ssh_enabled ? "remmina-rdp-ssh" : "remmina-rdp"); - } - else if (strncmp (item->protocol, "VNC", 3) == 0) - { - iconname = (item->ssh_enabled ? "remmina-vnc-ssh" : "remmina-vnc"); - } - else if (g_strcmp0(item->protocol, "XDMCP") == 0) - { - iconname = (item->ssh_enabled ? "remmina-xdmcp-ssh" : "remmina-xdmcp"); - } - else if (g_strcmp0(item->protocol, "NX") == 0) - { - iconname = "remmina-nx"; - } - else - { - iconname = "remmina"; - } - widget = gtk_image_new_from_icon_name(iconname, GTK_ICON_SIZE_MENU); - } - else - { - widget = gtk_image_new_from_icon_name("go-jump", GTK_ICON_SIZE_MENU); - } - - gtk_widget_show(widget); - if (item->server) { gtk_widget_set_tooltip_text(GTK_WIDGET(item), item->server); diff --git a/remmina/src/remmina_avahi.c b/remmina/src/remmina_avahi.c index 9ec1ad46d..dcdb99498 100644 --- a/remmina/src/remmina_avahi.c +++ b/remmina/src/remmina_avahi.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_chat_window.c b/remmina/src/remmina_chat_window.c index d279a1c7b..2dd312170 100644 --- a/remmina/src/remmina_chat_window.c +++ b/remmina/src/remmina_chat_window.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009 - Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_connection_window.c b/remmina/src/remmina_connection_window.c index 1dc11de4c..33c4265bc 100644 --- a/remmina/src/remmina_connection_window.c +++ b/remmina/src/remmina_connection_window.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -102,6 +103,9 @@ struct _RemminaConnectionWindowPriv /* Timer to hide the toolbar */ guint hidetb_timer; + /* Timer to save new window state and wxh */ + guint savestate_eventsourceid; + GtkWidget* toolbar; GtkWidget* grid; @@ -586,6 +590,11 @@ static void remmina_connection_window_destroy(GtkWidget* widget, RemminaConnecti g_source_remove(priv->ftb_hide_eventsource); priv->ftb_hide_eventsource = 0; } + if (priv->savestate_eventsourceid) + { + g_source_remove(priv->savestate_eventsourceid); + priv->savestate_eventsourceid = 0; + } #if FLOATING_TOOLBAR_WIDGET /* There is no need to destroy priv->floating_toolbar_widget, @@ -2362,7 +2371,7 @@ static gboolean remmina_connection_window_focus_out_event(GtkWidget* widget, Gdk #if DEBUG_KB_GRABBING printf("DEBUG_KB_GRABBING: focus out and mouse_pointer_entered is %s\n", cnnhld->cnnwin->priv->mouse_pointer_entered ? "true":"false"); #endif - remmina_connection_holder_keyboard_ungrab(cnnhld); + remmina_connection_window_focus_out(widget, cnnhld); return FALSE; } @@ -2372,7 +2381,7 @@ static gboolean remmina_connection_window_focus_in_event(GtkWidget* widget, GdkE #if DEBUG_KB_GRABBING printf("DEBUG_KB_GRABBING: focus in and mouse_pointer_entered is %s\n", cnnhld->cnnwin->priv->mouse_pointer_entered ? "true":"false"); #endif - remmina_connection_holder_keyboard_grab(cnnhld); + remmina_connection_window_focus_in(widget, cnnhld); return FALSE; } @@ -2488,33 +2497,65 @@ static gboolean remmina_connection_holder_floating_toolbar_on_scroll(GtkWidget* return FALSE; } +static gboolean remmina_connection_window_after_configure_scrolled(gpointer user_data) +{ + TRACE_CALL("remmina_connection_window_after_configure_scrolled"); + gint width, height; + GdkWindowState s; + gint ipg, npages; + RemminaConnectionObject* cnnobj; + RemminaConnectionHolder* cnnhld; + + cnnhld = (RemminaConnectionHolder*)user_data; + + s = gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(cnnhld->cnnwin))); + + if (!cnnhld || !cnnhld->cnnwin) + return FALSE; + + /* Changed window_maximize, window_width and window_height for all + * connections inside the notebook */ + npages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(cnnhld->cnnwin->priv->notebook)); + for(ipg = 0; ipg < npages; ipg ++) { + cnnobj = g_object_get_data( + G_OBJECT(gtk_notebook_get_nth_page(GTK_NOTEBOOK(cnnhld->cnnwin->priv->notebook), ipg)), + "cnnobj"); + if (s & GDK_WINDOW_STATE_MAXIMIZED) { + remmina_file_set_int(cnnobj->remmina_file, "window_maximize", TRUE); + } else { + gtk_window_get_size(GTK_WINDOW(cnnhld->cnnwin), &width, &height); + remmina_file_set_int(cnnobj->remmina_file, "window_width", width); + remmina_file_set_int(cnnobj->remmina_file, "window_height", height); + remmina_file_set_int(cnnobj->remmina_file, "window_maximize", FALSE); + } + } + cnnhld->cnnwin->priv->savestate_eventsourceid = 0; + return FALSE; +} + static gboolean remmina_connection_window_on_configure(GtkWidget* widget, GdkEventConfigure* event, RemminaConnectionHolder* cnnhld) { TRACE_CALL("remmina_connection_window_on_configure"); DECLARE_CNNOBJ_WITH_RETURN(FALSE) - gint width, height; #if !FLOATING_TOOLBAR_WIDGET RemminaConnectionWindowPriv* priv = cnnhld->cnnwin->priv; GtkRequisition req; gint y; #endif + if (cnnhld->cnnwin->priv->savestate_eventsourceid) { + g_source_remove(cnnhld->cnnwin->priv->savestate_eventsourceid); + cnnhld->cnnwin->priv->savestate_eventsourceid = 0; + } + if (cnnhld->cnnwin && gtk_widget_get_window(GTK_WIDGET(cnnhld->cnnwin)) && cnnhld->cnnwin->priv->view_mode == SCROLLED_WINDOW_MODE) { - /* Here we store the window state in real-time */ - if ((gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(cnnhld->cnnwin))) & GDK_WINDOW_STATE_MAXIMIZED) == 0) - { - gtk_window_get_size(GTK_WINDOW(cnnhld->cnnwin), &width, &height); - remmina_file_set_int(cnnobj->remmina_file, "window_width", width); - remmina_file_set_int(cnnobj->remmina_file, "window_height", height); - remmina_file_set_int(cnnobj->remmina_file, "window_maximize", FALSE); - } - else - { - remmina_file_set_int(cnnobj->remmina_file, "window_maximize", TRUE); - } + /* Under gnome shell we receive this configure_event BEFORE a window + * is really unmaximized, so we must read its new state and dimensions + * later, not now */ + cnnhld->cnnwin->priv->savestate_eventsourceid = g_timeout_add(500, remmina_connection_window_after_configure_scrolled, cnnhld); } #if !FLOATING_TOOLBAR_WIDGET diff --git a/remmina/src/remmina_connection_window.h b/remmina/src/remmina_connection_window.h index fbdd9c09b..52f57914d 100644 --- a/remmina/src/remmina_connection_window.h +++ b/remmina/src/remmina_connection_window.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009 - Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_crypt.c b/remmina/src/remmina_crypt.c index a476f5f6b..6aad45618 100644 --- a/remmina/src/remmina_crypt.c +++ b/remmina/src/remmina_crypt.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009 - Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_exec.c b/remmina/src/remmina_exec.c index 265240325..77a6b6c15 100644 --- a/remmina/src/remmina_exec.c +++ b/remmina/src/remmina_exec.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -66,7 +67,10 @@ void remmina_exec_exitremmina() { TRACE_CALL("remmina_exec_exitremmina"); - /* Destroy all widgets, main window included */ + /* Save main window state/position */ + remmina_main_save_before_destroy(); + + /* Delete all widgets, main window not included */ remmina_widget_pool_foreach(cb_closewidget, NULL); /* Remove systray menu */ diff --git a/remmina/src/remmina_file.c b/remmina/src/remmina_file.c index e7fa9a7b4..5c7613e82 100644 --- a/remmina/src/remmina_file.c +++ b/remmina/src/remmina_file.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -217,10 +218,12 @@ remmina_file_load(const gchar *filename) gchar *proto; gchar **keys; gchar *key; + gchar *resolution_str; gint i; gchar *s, *sec; RemminaProtocolPlugin* protocol_plugin; RemminaSecretPlugin *secret_plugin; + int w, h; gkeyfile = g_key_file_new(); @@ -278,8 +281,24 @@ remmina_file_load(const gchar *filename) } else { - remmina_file_set_string_ref(remminafile, key, + /* If we find "resolution", then we split it in two */ + if (strcmp(key, "resolution") == 0) + { + resolution_str = g_key_file_get_string(gkeyfile, "remmina", key, NULL); + if (remmina_public_split_resolution_string(resolution_str, &w, &h)) { + remmina_file_set_string_ref(remminafile, "resolution_width", g_strdup_printf("%i", w)); + remmina_file_set_string_ref(remminafile, "resolution_height", g_strdup_printf("%i", h)); + } else { + remmina_file_set_string_ref(remminafile, "resolution_width", NULL); + remmina_file_set_string_ref(remminafile, "resolution_height", NULL); + } + g_free(resolution_str); + } + else + { + remmina_file_set_string_ref(remminafile, key, g_key_file_get_string(gkeyfile, "remmina", key, NULL)); + } } } g_strfreev(keys); @@ -304,8 +323,17 @@ void remmina_file_set_string(RemminaFile *remminafile, const gchar *setting, con void remmina_file_set_string_ref(RemminaFile *remminafile, const gchar *setting, gchar *value) { TRACE_CALL("remmina_file_set_string_ref"); + const gchar* message; + if (value) { + /* We refuse to accept to set the "resolution" field */ + if (strcmp(setting, "resolution") == 0) { + message = "WARNING: the \"resolution\" setting in .pref files is deprecated, but some code in remmina or in a plugin is trying to set it.\n"; + fputs(message, stdout); + remmina_main_show_warning_dialog(message); + return; + } g_hash_table_insert(remminafile->settings, g_strdup(setting), value); } else @@ -319,6 +347,10 @@ remmina_file_get_string(RemminaFile *remminafile, const gchar *setting) { TRACE_CALL("remmina_file_get_string"); gchar *value; + const gchar* message; + + /* Returned value is a pointer to the string stored on the hash table, + * please do not free it or the hash table will contain invalid pointer */ if ( !remmina_masterthread_exec_is_main_thread() ) { @@ -336,6 +368,13 @@ remmina_file_get_string(RemminaFile *remminafile, const gchar *setting) return retval; } + if (strcmp(setting, "resolution") == 0) { + message = "WARNING: the \"resolution\" setting in .pref files is deprecated, but some code in remmina or in a plugin is trying to read it.\n"; + fputs(message, stdout); + remmina_main_show_warning_dialog(message); + return NULL; + } + value = (gchar*) g_hash_table_lookup(remminafile->settings, setting); return value && value[0] ? value : NULL; } @@ -465,12 +504,8 @@ void remmina_file_save(RemminaFile *remminafile) } } - /* Merge resolution_width and resolution_height into resolution */ - s = g_strdup_printf("%dx%d", remmina_file_get_int(remminafile, "resolution_width", 800), remmina_file_get_int(remminafile, "resolution_height", 600)); - g_key_file_set_string(gkeyfile, "remmina", "resolution", s); - g_free(s); - g_key_file_remove_key(gkeyfile, "remmina", "resolution_width", NULL); - g_key_file_remove_key(gkeyfile, "remmina", "resolution_height", NULL); + /* Avoid storing redundant and deprecated "resolution" field */ + g_key_file_remove_key(gkeyfile, "remmina", "resolution", NULL); /* Store gkeyfile to disk (password are already sent to keyring) */ content = g_key_file_to_data(gkeyfile, &length, NULL); @@ -538,13 +573,14 @@ void remmina_file_update_screen_resolution(RemminaFile *remminafile) #else gint monitor; #endif - gchar *pos; - gchar *resolution; + const gchar *resolution_w, *resolution_h; gint x, y; GdkRectangle rect; - resolution = g_strdup(remmina_file_get_string(remminafile, "resolution")); - if (resolution == NULL || strchr(resolution, 'x') == NULL) + resolution_w = remmina_file_get_string(remminafile, "resolution_width"); + resolution_h = remmina_file_get_string(remminafile, "resolution_height"); + + if (resolution_w == NULL || resolution_h == NULL || resolution_w[0] == 0 || resolution_h[0] == 0) { display = gdk_display_get_default(); /* gdk_display_get_device_manager deprecated since 3.20, Use gdk_display_get_default_seat */ @@ -566,14 +602,6 @@ void remmina_file_update_screen_resolution(RemminaFile *remminafile) remmina_file_set_int(remminafile, "resolution_width", rect.width); remmina_file_set_int(remminafile, "resolution_height", rect.height); } - else - { - pos = strchr(resolution, 'x'); - *pos++ = '\0'; - remmina_file_set_int(remminafile, "resolution_width", MAX(100, MIN(4096, atoi(resolution)))); - remmina_file_set_int(remminafile, "resolution_height", MAX(100, MIN(4096, atoi(pos)))); - } - g_free(resolution); } const gchar* @@ -664,7 +692,7 @@ remmina_file_get_datetime(RemminaFile *remminafile) { TRACE_CALL("remmina_file_get_datetime"); - GFile *file = g_file_new_for_path (remminafile->filename); + GFile *file; GFileInfo *info; struct timeval tv; @@ -674,12 +702,16 @@ remmina_file_get_datetime(RemminaFile *remminafile) guint64 mtime; gchar *modtime_string; + file = g_file_new_for_path (remminafile->filename); + info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED, G_FILE_QUERY_INFO_NONE, NULL, NULL); + g_object_unref(file); + if (info == NULL) { g_print("couldn't get time info\n"); return "26/01/1976 23:30:00"; diff --git a/remmina/src/remmina_file.h b/remmina/src/remmina_file.h index f375c5c03..eb411bee8 100644 --- a/remmina/src/remmina_file.h +++ b/remmina/src/remmina_file.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_file_editor.c b/remmina/src/remmina_file_editor.c index 9c2c1c949..8a583562f 100644 --- a/remmina/src/remmina_file_editor.c +++ b/remmina/src/remmina_file_editor.c @@ -320,6 +320,7 @@ static void remmina_file_editor_ssh_enabled_check_on_toggled(GtkToggleButton* to gtk_widget_set_sensitive(gfe->priv->ssh_auth_publickey_radio, enabled); gtk_widget_set_sensitive(gfe->priv->ssh_auth_auto_publickey_radio, enabled); } + g_free(p); } remmina_file_editor_ssh_auth_publickey_radio_on_toggled(NULL, gfe); @@ -496,7 +497,8 @@ static void remmina_file_editor_create_resolution(RemminaFileEditor* gfe, const TRACE_CALL("remmina_file_editor_create_resolution"); GtkWidget* widget; GtkWidget* hbox; - const gchar* resolution; + const gchar *resolution_w, *resolution_h; + gchar *res_str; widget = gtk_label_new(_("Resolution")); gtk_widget_show(widget); @@ -518,9 +520,14 @@ static void remmina_file_editor_create_resolution(RemminaFileEditor* gfe, const gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0); gfe->priv->resolution_custom_radio = widget; - resolution = remmina_file_get_string(gfe->priv->remmina_file, "resolution"); + resolution_w = remmina_file_get_string(gfe->priv->remmina_file, "resolution_width"); + resolution_h = remmina_file_get_string(gfe->priv->remmina_file, "resolution_height"); - widget = remmina_public_create_combo_text_d(remmina_pref.resolutions, resolution, NULL); + if (resolution_w && resolution_h && resolution_w[0] != 0 && resolution_h[0] != 0) + res_str = g_strdup_printf("%sx%s", resolution_w, resolution_h); + else + res_str = NULL; + widget = remmina_public_create_combo_text_d(remmina_pref.resolutions, res_str, NULL); gtk_widget_show(widget); gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); gfe->priv->resolution_custom_combo = widget; @@ -533,15 +540,17 @@ static void remmina_file_editor_create_resolution(RemminaFileEditor* gfe, const g_signal_connect(G_OBJECT(gfe->priv->resolution_custom_radio), "toggled", G_CALLBACK(remmina_file_editor_button_on_toggled), gfe->priv->resolution_custom_combo); - if (!resolution || strchr(resolution, 'x') == NULL) + if (res_str) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gfe->priv->resolution_auto_radio), TRUE); - gtk_widget_set_sensitive(gfe->priv->resolution_custom_combo, FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gfe->priv->resolution_custom_radio), TRUE); } else { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gfe->priv->resolution_custom_radio), TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gfe->priv->resolution_auto_radio), TRUE); + gtk_widget_set_sensitive(gfe->priv->resolution_custom_combo, FALSE); } + + g_free(res_str); } static GtkWidget* remmina_file_editor_create_text(RemminaFileEditor* gfe, GtkWidget* grid, @@ -958,6 +967,7 @@ static void remmina_file_editor_create_ssh_tab(RemminaFileEditor* gfe, RemminaPr remmina_file_editor_ssh_enabled_check_on_toggled (NULL, gfe, ssh_setting); } + g_free(p); #endif } @@ -1125,6 +1135,9 @@ static void remmina_file_editor_update_settings(RemminaFileEditor* gfe) static void remmina_file_editor_update(RemminaFileEditor* gfe) { TRACE_CALL("remmina_file_editor_update"); + gchar *custom_resolution, *res_w, *res_h; + int w, h; + RemminaFileEditorPriv* priv = gfe->priv; remmina_file_set_string(priv->remmina_file, "name", gtk_entry_get_text(GTK_ENTRY(priv->name_entry))); @@ -1143,13 +1156,28 @@ static void remmina_file_editor_update(RemminaFileEditor* gfe) if (priv->resolution_auto_radio) { - remmina_file_set_string_ref( - priv->remmina_file, - "resolution", - (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->resolution_auto_radio)) ? - NULL : - remmina_public_combo_get_active_text( - GTK_COMBO_BOX(priv->resolution_custom_combo)))); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->resolution_auto_radio))) + { + /* Resolution is set to auto */ + res_w = res_h = NULL; + } + else + { + /* Resolution is set to a value from the list */ + custom_resolution = remmina_public_combo_get_active_text(GTK_COMBO_BOX(priv->resolution_custom_combo)); + if (sscanf(custom_resolution, "%dx%d", &w, &h) >= 2) + { + res_w = g_strdup_printf("%i", w); + res_h = g_strdup_printf("%i", h); + } + else + { + res_w = res_h = NULL; + } + g_free(custom_resolution); + } + remmina_file_set_string_ref(priv->remmina_file, "resolution_width", res_w); + remmina_file_set_string_ref(priv->remmina_file, "resolution_height", res_h); } if (priv->keymap_combo) @@ -1193,9 +1221,12 @@ static void remmina_file_editor_on_default(GtkWidget* button, RemminaFileEditor* static void remmina_file_editor_on_save(GtkWidget* button, RemminaFileEditor* gfe) { TRACE_CALL("remmina_file_editor_on_save"); + remmina_file_editor_update(gfe); + remmina_file_save(gfe->priv->remmina_file); remmina_icon_populate_menu(); + gtk_widget_destroy(GTK_WIDGET(gfe)); } @@ -1219,6 +1250,7 @@ static void remmina_file_editor_on_connect(GtkWidget* button, RemminaFileEditor* static void remmina_file_editor_on_save_connect(GtkWidget* button, RemminaFileEditor* gfe) { TRACE_CALL("remmina_file_editor_on_save_connect"); + /* TODO: Call remmina_file_editor_on_save */ RemminaFile* gf; remmina_file_editor_update(gfe); diff --git a/remmina/src/remmina_file_manager.c b/remmina/src/remmina_file_manager.c index 2d4464bc4..0ba743857 100644 --- a/remmina/src/remmina_file_manager.c +++ b/remmina/src/remmina_file_manager.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -46,7 +47,8 @@ static gchar *remminadir; -/* return first found data dir as per XDG specs */ +/* return first found data dir as per XDG specs. + * The returned string must be freed by the caller with g_free */ gchar *remmina_file_get_datadir(void) { TRACE_CALL("remmina_file_get_datadir"); @@ -54,6 +56,7 @@ gchar *remmina_file_get_datadir(void) int i; /* Legacy ~/.remmina */ remminadir = g_build_path ("/", g_get_home_dir(), dir, NULL); + g_free(dir); if (g_file_test (remminadir, G_FILE_TEST_IS_DIR)) return remminadir; g_free (remminadir), remminadir = NULL; @@ -136,8 +139,6 @@ void remmina_file_manager_init(void) /* At last we make sure we use XDG_USER_DATA */ if (remminadir != NULL) g_free (remminadir), remminadir = NULL; - remminadir = g_build_path ( "/", g_get_user_data_dir (), - g_get_prgname (), NULL); } gint remmina_file_manager_iterate(GFunc func, gpointer user_data) @@ -148,9 +149,10 @@ gint remmina_file_manager_iterate(GFunc func, gpointer user_data) const gchar* name; RemminaFile* remminafile; gint items_count = 0; + gchar* remmina_data_dir; - /* It should always return XDG_DATA_HOME */ - dir = g_dir_open(remmina_file_get_datadir(), 0, NULL); + remmina_data_dir = remmina_file_get_datadir(); + dir = g_dir_open(remmina_data_dir, 0, NULL); if (dir) { @@ -159,7 +161,7 @@ gint remmina_file_manager_iterate(GFunc func, gpointer user_data) if (!g_str_has_suffix(name, ".remmina")) continue; g_snprintf(filename, MAX_PATH_LEN, "%s/%s", - remmina_file_get_datadir(), name); + remmina_data_dir, name); remminafile = remmina_file_load(filename); if (remminafile) { @@ -170,6 +172,7 @@ gint remmina_file_manager_iterate(GFunc func, gpointer user_data) } g_dir_close(dir); } + g_free(remmina_data_dir); return items_count; } @@ -183,10 +186,12 @@ gchar* remmina_file_manager_get_groups(void) RemminaStringArray* array; const gchar* group; gchar* groups; + gchar* remmina_data_dir; + remmina_data_dir = remmina_file_get_datadir(); array = remmina_string_array_new(); - dir = g_dir_open(remmina_file_get_datadir(), 0, NULL); + dir = g_dir_open(remmina_data_dir, 0, NULL); if (dir == NULL) return 0; @@ -194,7 +199,7 @@ gchar* remmina_file_manager_get_groups(void) { if (!g_str_has_suffix(name, ".remmina")) continue; - g_snprintf(filename, MAX_PATH_LEN, "%s/%s", remmina_file_get_datadir(), name); + g_snprintf(filename, MAX_PATH_LEN, "%s/%s", remmina_data_dir, name); remminafile = remmina_file_load(filename); group = remmina_file_get_string(remminafile, "group"); if (group && remmina_string_array_find(array, group) < 0) @@ -207,6 +212,7 @@ gchar* remmina_file_manager_get_groups(void) remmina_string_array_sort(array); groups = remmina_string_array_to_string(array); remmina_string_array_free(array); + g_free(remmina_data_dir); return groups; } diff --git a/remmina/src/remmina_ftp_client.c b/remmina/src/remmina_ftp_client.c index 25397b4a4..b1680864b 100644 --- a/remmina/src/remmina_ftp_client.c +++ b/remmina/src/remmina_ftp_client.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_ftp_client.h b/remmina/src/remmina_ftp_client.h index 4eed76cdc..cf82df65c 100644 --- a/remmina/src/remmina_ftp_client.h +++ b/remmina/src/remmina_ftp_client.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_icon.c b/remmina/src/remmina_icon.c index ab1ff2b72..5e58800d5 100644 --- a/remmina/src/remmina_icon.c +++ b/remmina/src/remmina_icon.c @@ -2,7 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo - * Copyright (C) 2016 Antenore Gatta, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -49,7 +49,7 @@ #include "remmina_sysinfo.h" #ifdef HAVE_LIBAPPINDICATOR -#include <libappindicator/app-indicator.h> +#include <app-indicator.h> #endif typedef struct _RemminaIcon diff --git a/remmina/src/remmina_init_dialog.c b/remmina/src/remmina_init_dialog.c index c26ffd175..8351dcad3 100644 --- a/remmina/src/remmina_init_dialog.c +++ b/remmina/src/remmina_init_dialog.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_init_dialog.h b/remmina/src/remmina_init_dialog.h index 67f58938b..42902bff0 100644 --- a/remmina/src/remmina_init_dialog.h +++ b/remmina/src/remmina_init_dialog.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_key_chooser.c b/remmina/src/remmina_key_chooser.c index 2f526a887..7d172f428 100644 --- a/remmina/src/remmina_key_chooser.c +++ b/remmina/src/remmina_key_chooser.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_log.c b/remmina/src/remmina_log.c index c08a3b0a1..aa27f52a2 100644 --- a/remmina/src/remmina_log.c +++ b/remmina/src/remmina_log.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_main.c b/remmina/src/remmina_main.c index f9bc1d6b4..84d52f2d0 100644 --- a/remmina/src/remmina_main.c +++ b/remmina/src/remmina_main.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -125,8 +126,10 @@ static void remmina_main_save_expanded_group(void) } } -static void remmina_main_save_before_destroy() +void remmina_main_save_before_destroy() { + if (!remminamain || !remminamain->window) + return; remmina_main_save_size(); remmina_main_save_expanded_group(); remmina_pref_save(); @@ -152,25 +155,30 @@ gboolean remmina_main_on_delete_event(GtkWidget *widget, GdkEvent *event, gpoint return FALSE; } -void remmina_main_destroy(GtkWidget *widget, gpointer user_data) +void remmina_main_destroy() { TRACE_CALL("remmina_main_destroy"); - g_free(remmina_pref.expanded_group); - remmina_pref.expanded_group = remmina_string_array_to_string(remminamain->priv->expanded_group); - remmina_string_array_free(remminamain->priv->expanded_group); - remminamain->priv->expanded_group = NULL; - - if (remminamain->priv->file_model) - g_object_unref(G_OBJECT(remminamain->priv->file_model)); - g_object_unref(G_OBJECT(remminamain->priv->file_model_filter)); - g_object_unref(G_OBJECT(remminamain->builder)); - g_free(remminamain->priv->selected_filename); - g_free(remminamain->priv->selected_name); - g_free(remminamain->priv); - g_free(remminamain); - - remminamain = NULL; + /* Called when main window is destroyed via a call of gtk_widget_destroy() */ + if (remminamain) { + if (remminamain->window) + remmina_main_save_before_destroy(); + g_free(remmina_pref.expanded_group); + remmina_pref.expanded_group = remmina_string_array_to_string(remminamain->priv->expanded_group); + remmina_string_array_free(remminamain->priv->expanded_group); + remminamain->priv->expanded_group = NULL; + + if (remminamain->priv->file_model) + g_object_unref(G_OBJECT(remminamain->priv->file_model)); + g_object_unref(G_OBJECT(remminamain->priv->file_model_filter)); + g_object_unref(remminamain->builder); + g_free(remminamain->priv->selected_filename); + g_free(remminamain->priv->selected_name); + g_free(remminamain->priv); + g_free(remminamain); + + remminamain = NULL; + } } static void remmina_main_clear_selection_data(void) @@ -1242,3 +1250,14 @@ void remmina_main_update_file_datetime(RemminaFile *file) return; remmina_main_load_files(); } + +void remmina_main_show_warning_dialog(const gchar* message) +{ + GtkWidget* dialog; + if (remminamain->window) { + dialog = gtk_message_dialog_new(remminamain->window, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + message, g_get_application_name()); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } +} diff --git a/remmina/src/remmina_main.h b/remmina/src/remmina_main.h index 3b01c6888..15469ee24 100644 --- a/remmina/src/remmina_main.h +++ b/remmina/src/remmina_main.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -114,6 +115,11 @@ GtkWindow* remmina_main_get_window(void); void remmina_main_update_file_datetime(RemminaFile *file); +void remmina_main_destroy(void); +void remmina_main_save_before_destroy(void); + +void remmina_main_show_warning_dialog(const gchar* message); + G_END_DECLS #endif /* __REMMINAMAIN_H__ */ diff --git a/remmina/src/remmina_marshals.c b/remmina/src/remmina_marshals.c index c3f203a29..4e7033c9f 100644 --- a/remmina/src/remmina_marshals.c +++ b/remmina/src/remmina_marshals.c @@ -3,6 +3,7 @@ * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2011 Marc-Andre Moreau * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_masterthread_exec.c b/remmina/src/remmina_masterthread_exec.c index 4cec08093..286550ceb 100644 --- a/remmina/src/remmina_masterthread_exec.c +++ b/remmina/src/remmina_masterthread_exec.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_masterthread_exec.h b/remmina/src/remmina_masterthread_exec.h index 7cacf5937..88f8eb440 100644 --- a/remmina/src/remmina_masterthread_exec.h +++ b/remmina/src/remmina_masterthread_exec.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_plugin_cmdexec.c b/remmina/src/remmina_plugin_cmdexec.c index 45c615136..87ccf1c37 100644 --- a/remmina/src/remmina_plugin_cmdexec.c +++ b/remmina/src/remmina_plugin_cmdexec.c @@ -1,7 +1,7 @@ /* * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2010 Vic Lee - * Copyright (C) 2014-2015 Antenore Gatta, Giovanni Panozzo + * Copyright (C) 2014-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_plugin_cmdexec.h b/remmina/src/remmina_plugin_cmdexec.h index 971830f8e..319e71d04 100644 --- a/remmina/src/remmina_plugin_cmdexec.h +++ b/remmina/src/remmina_plugin_cmdexec.h @@ -1,7 +1,7 @@ /* * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2010 Vic Lee - * Copyright (C) 2014-2015 Antenore Gatta, Giovanni Panozzo + * Copyright (C) 2014-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_plugin_manager.c b/remmina/src/remmina_plugin_manager.c index 6c04a8791..1579ee15d 100644 --- a/remmina/src/remmina_plugin_manager.c +++ b/remmina/src/remmina_plugin_manager.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_plugin_manager.h b/remmina/src/remmina_plugin_manager.h index 0c464d2db..33c49054f 100644 --- a/remmina/src/remmina_plugin_manager.h +++ b/remmina/src/remmina_plugin_manager.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_pref.c b/remmina/src/remmina_pref.c index 87d95d53d..2b770750c 100644 --- a/remmina/src/remmina_pref.c +++ b/remmina/src/remmina_pref.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_pref.h b/remmina/src/remmina_pref.h index 2363a962b..4090b75da 100644 --- a/remmina/src/remmina_pref.h +++ b/remmina/src/remmina_pref.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_pref_dialog.c b/remmina/src/remmina_pref_dialog.c index 46bce6bd5..0bd3f5bee 100644 --- a/remmina/src/remmina_pref_dialog.c +++ b/remmina/src/remmina_pref_dialog.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -37,6 +38,7 @@ #include <glib/gi18n.h> #include <stdlib.h> #include "config.h" +#include <vte/vte.h> #include "remmina_public.h" #include "remmina_string_list.h" #include "remmina_widget_pool.h" @@ -432,6 +434,26 @@ static void remmina_pref_dialog_init(void) gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_color14), &color); gdk_rgba_parse(&color, remmina_pref.color15); gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(remmina_pref_dialog->colorbutton_color15), &color); +#if !VTE_CHECK_VERSION(0,38,0) + /* Disable color scheme buttons if old version of VTE */ + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_cursor), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color0), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color1), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color2), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color3), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color4), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color5), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color6), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color7), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color8), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color9), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color10), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color11), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color12), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color13), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color14), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET(remmina_pref_dialog->colorbutton_color15), FALSE); +#endif g_snprintf(buf, sizeof(buf), "%i", remmina_pref.vte_lines); gtk_entry_set_text(remmina_pref_dialog->entry_scrollback_lines, buf); @@ -545,7 +567,9 @@ GtkDialog* remmina_pref_dialog_new(gint default_tab, GtkWindow *parent) remmina_pref_dialog->colorbutton_color13 = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_color13")); remmina_pref_dialog->colorbutton_color14 = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_color14")); remmina_pref_dialog->colorbutton_color15 = GTK_COLOR_BUTTON(GET_OBJECT("colorbutton_color15")); +#if VTE_CHECK_VERSION(0,38,0) remmina_pref_dialog->filechooserbutton_terminal_color_scheme = GTK_FILE_CHOOSER(GET_OBJECT("filechooserbutton_terminal_color_scheme")); +#endif /* Connect signals */ gtk_builder_connect_signals(remmina_pref_dialog->builder, NULL); diff --git a/remmina/src/remmina_protocol_widget.h b/remmina/src/remmina_protocol_widget.h index c4a251492..0b65645cd 100644 --- a/remmina/src/remmina_protocol_widget.h +++ b/remmina/src/remmina_protocol_widget.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_public.c b/remmina/src/remmina_public.c index 2ec92f7eb..78eb3e25c 100644 --- a/remmina/src/remmina_public.c +++ b/remmina/src/remmina_public.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -730,3 +731,14 @@ gchar* remmina_public_str_replace_in_place(gchar *string, const gchar *search, c return string; } +int remmina_public_split_resolution_string(const char *resolution_string, int *w, int *h) +{ + int lw, lh; + if (resolution_string == NULL || resolution_string[0] == 0) + return 0; + if (sscanf(resolution_string, "%dx%d", &lw, &lh) != 2) + return 0; + *w = lw; + *h = lh; + return 1; +} diff --git a/remmina/src/remmina_public.h b/remmina/src/remmina_public.h index 06718f157..0604f706f 100644 --- a/remmina/src/remmina_public.h +++ b/remmina/src/remmina_public.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 @@ -115,4 +116,6 @@ gchar* remmina_public_str_replace(const gchar *string, const gchar *search, cons /* Replaces all occurences of search in a new copy of string by replacement * and overwrites the original string */ gchar* remmina_public_str_replace_in_place(gchar *string, const gchar *search, const gchar *replacement); +int remmina_public_split_resolution_string(const char *resolution_string, int *w, int *h); + #endif /* __REMMINAPUBLIC_H__ */ diff --git a/remmina/src/remmina_scrolled_viewport.c b/remmina/src/remmina_scrolled_viewport.c index 9cef0bbdc..bfed49bd0 100644 --- a/remmina/src/remmina_scrolled_viewport.c +++ b/remmina/src/remmina_scrolled_viewport.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009 - Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_sftp_client.c b/remmina/src/remmina_sftp_client.c index f3a3a9b46..4839a36c1 100644 --- a/remmina/src/remmina_sftp_client.c +++ b/remmina/src/remmina_sftp_client.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_sftp_client.h b/remmina/src/remmina_sftp_client.h index b84e96fd0..167b86187 100644 --- a/remmina/src/remmina_sftp_client.h +++ b/remmina/src/remmina_sftp_client.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009-2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_sftp_plugin.h b/remmina/src/remmina_sftp_plugin.h index 7798f22df..328b13078 100644 --- a/remmina/src/remmina_sftp_plugin.h +++ b/remmina/src/remmina_sftp_plugin.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_ssh.c b/remmina/src/remmina_ssh.c index 6a03b5102..6ffe72a9c 100644 --- a/remmina/src/remmina_ssh.c +++ b/remmina/src/remmina_ssh.c @@ -348,6 +348,7 @@ remmina_ssh_auth_gui (RemminaSSH *ssh, RemminaInitDialog *dialog, RemminaFile *r size_t len; guchar *pubkey; ssh_key server_pubkey; + gboolean disablepasswordstoring; /* Check if the server's public key is known */ ret = ssh_is_server_known (ssh->session); @@ -428,11 +429,13 @@ remmina_ssh_auth_gui (RemminaSSH *ssh, RemminaInitDialog *dialog, RemminaFile *r if (!dialog) return -1; remmina_init_dialog_set_status (dialog, tips, ssh->user, ssh->server); - ret = remmina_init_dialog_authpwd (dialog, keyname, TRUE); + disablepasswordstoring = remmina_file_get_int(remminafile, "disablepasswordstoring", FALSE); + ret = remmina_init_dialog_authpwd (dialog, keyname, !disablepasswordstoring); if (ret == GTK_RESPONSE_OK) { - remmina_file_set_string( remminafile, pwdtype, dialog->password); + if (dialog->save_password) + remmina_file_set_string(remminafile, pwdtype, dialog->password); } else { diff --git a/remmina/src/remmina_ssh_plugin.c b/remmina/src/remmina_ssh_plugin.c index 46ba16470..f2af0e0b5 100644 --- a/remmina/src/remmina_ssh_plugin.c +++ b/remmina/src/remmina_ssh_plugin.c @@ -467,8 +467,6 @@ remmina_plugin_ssh_init (RemminaProtocolWidget *gp) GtkWidget *vte; GdkRGBA foreground_color; GdkRGBA background_color; - GdkRGBA cursor_color; - GdkRGBA cp[PALETTE_SIZE]; #if !VTE_CHECK_VERSION(0,38,0) @@ -488,9 +486,15 @@ remmina_plugin_ssh_init (RemminaProtocolWidget *gp) gtk_widget_show(vte); vte_terminal_set_size (VTE_TERMINAL (vte), 80, 25); vte_terminal_set_scroll_on_keystroke (VTE_TERMINAL (vte), TRUE); +#if !VTE_CHECK_VERSION(0,38,0) + gdk_rgba_parse(&foreground_color, remmina_pref.foreground); + gdk_rgba_parse(&background_color, remmina_pref.background); +#endif remminafile = remmina_plugin_service->protocol_plugin_get_file (gp); #if VTE_CHECK_VERSION(0,38,0) + GdkRGBA cp[PALETTE_SIZE]; + GdkRGBA cursor_color; /* Set colors to GdkRGBA */ switch (remmina_plugin_service->file_get_int (remminafile, "ssh_color_scheme", FALSE)) { @@ -552,23 +556,10 @@ remmina_plugin_ssh_init (RemminaProtocolWidget *gp) gdk_rgba_parse(&cp[14], remmina_pref.color14); gdk_rgba_parse(&cp[15], remmina_pref.color15); - const GdkRGBA custom_palette[PALETTE_SIZE] = { cp[0] , - cp[1] , - cp[2] , - cp[3] , - cp[4] , - cp[5] , - cp[6] , - cp[7] , - cp[8] , - cp[9] , - cp[10], - cp[11], - cp[12], - cp[13], - cp[14], - cp[15] - }; + const GdkRGBA custom_palette[PALETTE_SIZE] = { + cp[0] , cp[1] , cp[2] , cp[3] , cp[4] , cp[5] , + cp[6] , cp[7] , cp[8] , cp[9] , cp[10], cp[11], + cp[12], cp[13], cp[14], cp[15] }; remminavte.palette = custom_palette; break; @@ -577,6 +568,8 @@ remmina_plugin_ssh_init (RemminaProtocolWidget *gp) break; } vte_terminal_set_colors (VTE_TERMINAL(vte), &foreground_color, &background_color, remminavte.palette, PALETTE_SIZE); + vte_terminal_set_color_foreground (VTE_TERMINAL(vte), &foreground_color); + vte_terminal_set_color_background (VTE_TERMINAL(vte), &background_color); vte_terminal_set_color_cursor (VTE_TERMINAL(vte), &cursor_color); #else /* VTE <= 2.90 doesn't support GdkRGBA so we must convert GdkRGBA to GdkColor */ @@ -815,6 +808,7 @@ static const RemminaProtocolSetting remmina_ssh_advanced_settings[] = { REMMINA_PROTOCOL_SETTING_TYPE_SELECT, "ssh_charset", N_("Character set"), FALSE, ssh_charset_list, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_SELECT, "ssh_color_scheme", N_("Terminal color scheme"), FALSE, ssh_terminal_palette, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "exec", N_("Startup program"), FALSE, NULL, NULL }, + { REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "disablepasswordstoring", N_("Disable password storing"), FALSE, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_END, NULL, NULL, FALSE, NULL, NULL } }; diff --git a/remmina/src/remmina_ssh_plugin.h b/remmina/src/remmina_ssh_plugin.h index 2d3b16ceb..02a71bf66 100644 --- a/remmina/src/remmina_ssh_plugin.h +++ b/remmina/src/remmina_ssh_plugin.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010-2011 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_string_array.c b/remmina/src/remmina_string_array.c index 7a7a3ab9c..07407daa5 100644 --- a/remmina/src/remmina_string_array.c +++ b/remmina/src/remmina_string_array.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009 - Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_string_list.c b/remmina/src/remmina_string_list.c index fc93fbb8c..f35ed67ab 100644 --- a/remmina/src/remmina_string_list.c +++ b/remmina/src/remmina_string_list.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009 - Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_string_list.h b/remmina/src/remmina_string_list.h index e713a2ada..41f202356 100644 --- a/remmina/src/remmina_string_list.h +++ b/remmina/src/remmina_string_list.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009 - Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_sysinfo.c b/remmina/src/remmina_sysinfo.c index ae8fd6d6d..a555cdc5f 100644 --- a/remmina/src/remmina_sysinfo.c +++ b/remmina/src/remmina_sysinfo.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_sysinfo.h b/remmina/src/remmina_sysinfo.h index d028a05f1..95b8cc4a8 100644 --- a/remmina/src/remmina_sysinfo.h +++ b/remmina/src/remmina_sysinfo.h @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2010 Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/src/remmina_widget_pool.c b/remmina/src/remmina_widget_pool.c index 203b0c62f..ccb739a11 100644 --- a/remmina/src/remmina_widget_pool.c +++ b/remmina/src/remmina_widget_pool.c @@ -2,6 +2,7 @@ * Remmina - The GTK+ Remote Desktop Client * Copyright (C) 2009 - Vic Lee * Copyright (C) 2014-2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo + * Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo * * 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 diff --git a/remmina/ui/CMakeLists.txt b/remmina/ui/CMakeLists.txt index 03fd25e2a..a56ac2a43 100644 --- a/remmina/ui/CMakeLists.txt +++ b/remmina/ui/CMakeLists.txt @@ -1,6 +1,7 @@ # desktop/remmina - The GTK+ Remote Desktop Client # # Copyright (C) 2015 Antenore Gatta, Fabio Castelli, Giovanni Panozzo +# Copyright (C) 2016-2017 Antenore Gatta, Giovanni Panozzo # # 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 diff --git a/remmina/ui/remmina_about.glade b/remmina/ui/remmina_about.glade index 3c3dc14d4..113f4933a 100644 --- a/remmina/ui/remmina_about.glade +++ b/remmina/ui/remmina_about.glade @@ -46,6 +46,7 @@ aihtdikh <aihtdikh@users.sourceforge.net> Alexander Logvinov <avl@logvinov.com> Andreas <andreas.angerer89@gmail.com> Andrey Gankov <gankov@opensuse.org> +Andrey <gankov@opensuse.org> Antenore Gatta <antenore@simbiosi.org> Antonio Guillen <antonio@guillen.com.es> Armin Novak <armin.novak@gmail.com> @@ -64,6 +65,7 @@ Dmitry Kubatkin <maelnor@gmail.com> dupondje <jean-louis@dupondje.be> e-alfred <e-alfred@users.noreply.github.com> Emmanuel Grognet <emmanuel@grognet.fr> +Eric Hoog <eric_hoog@hotmail.com> Frank Bongrand <fbongrand@free.fr> Funda Wang <fundawang@gmail.com> Giovanni Panozzo <giovanni@panozzo.it> @@ -71,6 +73,7 @@ Iain Lane <iain.lane@canonical.com> Igor Vuk <parcijala@gmail.com> Iivo Raitahila <iivo.raitahila@korv.fi> Jakub Adam <jakub.adam@ktknet.cz> +Janne Blomqvist <janne.blomqvist@aalto.fi> Jay Carlson <nop@nop.com> Jean-Louis Dupond <jean-louis@dupond.be> Jen Herting <jen@herting.cc> @@ -81,12 +84,12 @@ Jörgen Viksell <jviksell@gmail.com> Jose Gregorio Jimenez Sanchez <josegjimenez@gmail.com> Julian Ospald <hasufell@posteo.de> Justin Zobel <justin@solus-project.com> +Ken VanDine <kenvandine@users.noreply.github.com> Kirill Müller <krlmlr@users.noreply.github.com> Kyle Sanderson <kyle.leet@gmail.com> Laurentiu Nicola <lnicola@dend.ro> Luca Falavigna <dktrkranz@debian.org> Marc-André Moreau <marcandre.moreau@gmail.com> -Marco Trevisan <mail@3v1n0.net> Marco Trevisan (Treviño) <mail@3v1n0.net> Matteo F. Vescovi <mfvescovi+github@gmail.com> Matteo Nastasi <nastasi@alternativeoutput.it> @@ -94,12 +97,15 @@ Meskó Balázs <meskobalazs@gmail.com> Mike Dalessio <mike@csa.net> Mike Gilbert <floppym@gentoo.org> morph027 <morphsen@gmx.com> -nanxiongchao <nanxiongchao@loongson.cn> +Muflone <muflone@vbsimple.net> +Muflone <webreg@vbsimple.net> +nanxiongchao-loongson <nanxiongchao@loongson.cn> Nekhelesh Ramananthan <krnekhelesh@gmail.com> Nikolay Martynov <mar.kolya@gmail.com> Nils Steinger <git@n-st.de> Philippe Jandot <zfil@users.noreply.github.com> Raphael Kubo da Costa <rakuco@FreeBSD.org> +remminafan1 <32010086+remminafan1@users.noreply.github.com> Rene Rheaume <rene.rheaume@gmail.com> repzilon <repzilon@users.noreply.github.com> Rex Tsai <chihchun@kalug.linux.org.tw> @@ -110,6 +116,7 @@ Shuhrat Dehkanov <k@efir.uz> Steve Russo svrusso1@gmail.com <svrusso1@gmail.com> Swen Kooij <photonios@outlook.com> Sylvain Pasche <sylvain.pasche@gmail.com> +Test User <andreas.angerer89@gmail.com> Vic Lee (llyzs) <llyzs.vic@gmail.com> theraser <mail@hegerfeld.org> </property> diff --git a/remmina/ui/remmina_preferences.glade b/remmina/ui/remmina_preferences.glade index 7824a1cd7..8ee7d0cbb 100644 --- a/remmina/ui/remmina_preferences.glade +++ b/remmina/ui/remmina_preferences.glade @@ -1137,7 +1137,7 @@ Author: Antenore Gatta <property name="left_padding">7</property> <property name="right_padding">7</property> <child> - <object class="GtkBox"> + <object class="GtkBox" id="box_terminal"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -1385,7 +1385,7 @@ Author: Antenore Gatta </packing> </child> <child> - <object class="GtkGrid"> + <object class="GtkGrid" id="grid_colors"> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -1682,7 +1682,7 @@ Author: Antenore Gatta </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkLabel" id="label_color_chooser"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> diff --git a/snap/snapcraft.yaml.in b/snap/snapcraft.yaml.in index f90c69343..b25789c6c 100644 --- a/snap/snapcraft.yaml.in +++ b/snap/snapcraft.yaml.in @@ -45,7 +45,7 @@ parts: - libxv-dev configflags: - -DCMAKE_BUILD_TYPE=@CMAKE_BUILD_TYPE@ - - -DWITH_WAYLAND=off + - -DWITH_WAYLAND=on - -DWITH_CLIENT=off - -DWITH_SERVER=off - -DWITH_PULSE=on @@ -127,6 +127,8 @@ apps: plugs: - avahi-observe - cups-control + - desktop + - desktop-legacy - gsettings - home - mount-observe @@ -135,6 +137,7 @@ apps: - pulseaudio - unity7 - password-manager-service + - wayland winpr-makecert: command: winpr-makecert |