From 23fb2435a13c982e78180d9a949462112466b360 Mon Sep 17 00:00:00 2001
From: Et0h <boldly@gmail.com>
Date: Mon, 5 Jan 2015 02:07:47 +0000
Subject: [PATCH] GuiConfig: Move various settings into new Misc tab + move
 language into bottom layout

---
 buildPy2exe.py                  |   2 +-
 resources/cog.png               | Bin 0 -> 512 bytes
 syncplay/messages.py            |  35 +++--
 syncplay/ui/GuiConfiguration.py | 230 ++++++++++++++++++--------------
 4 files changed, 153 insertions(+), 114 deletions(-)
 create mode 100644 resources/cog.png

diff --git a/buildPy2exe.py b/buildPy2exe.py
index 20caad1..9f3113a 100644
--- a/buildPy2exe.py
+++ b/buildPy2exe.py
@@ -644,7 +644,7 @@ guiIcons = ['resources/accept.png', 'resources/arrow_undo.png', 'resources/clock
      'resources/eye.png', 'resources/comments.png', 'resources/cog_delete.png', 'resources/chevrons_right.png',
      'resources/user_key.png', 'resources/lock.png', 'resources/key_go.png', 'resources/page_white_key.png',
      'resources/tick.png', 'resources/lock_open.png', 'resources/empty_checkbox.png', 'resources/tick_checkbox.png',
-     'resources/world_explore.png', 'resources/application_get.png'
+     'resources/world_explore.png', 'resources/application_get.png', 'resources/cog.png'
     ]
 resources = ["resources/icon.ico", "resources/syncplay.png"]
 resources.extend(guiIcons)
diff --git a/resources/cog.png b/resources/cog.png
new file mode 100644
index 0000000000000000000000000000000000000000..67de2c6ccbeac17742f56cf7391e72b2bf5033ba
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzl1W5CR4C6?
zQB6w%VGv&Y0p9%y{*S$M5weR^mokV7i!Mcpk=YVa(4jh%5k+ND8>CQDsH?WF>AIFt
zQuJ}i;w2$ZUU#3SZ6RY0Gw;kZ&ol1~2ky^QZ(fom$=jN<T*X<otG0ao1Md*)XSSIA
z*x3T8gv)x7DUK|A#S3CA>JZt!z7w_pH~wdQ;R)Gh%BbQFCx+Nm!4SuS-vkr`vhhrX
zM*>w%e+v~?m@q~ImPAgtLkR_3U<2F8LP3W5=LJ*ZN|S5p#sf4YFr$p~Q~Z*0Ngxf2
zjk#J#<7EAlhzlrV53~GF&pIzcCN_lz9@05Ue<MwWI-*!M0jvB0F~pIke2>oUXiK%N
z#x+4o*i_c|6_Uu1+&TIho?3@y4k-#b8Y_o94zW*B3a1ne2-Y5s0uke$$|@=}OP-i=
zNYZQA=>PrZu0MfSL=b8UhD_={W4IY1{b{)U)*gc45xtL%IYLY&hF;d`@GzI&7H&D#
zh;z_BX$#hqh@q?AY3sJTod2%*Yd)_>YM0#q&ixGuh+PQsneK)F0000<MNUMnLSTXw
CAKTXe

literal 0
HcmV?d00001

diff --git a/syncplay/messages.py b/syncplay/messages.py
index 1194dcb..7e0504a 100755
--- a/syncplay/messages.py
+++ b/syncplay/messages.py
@@ -168,14 +168,14 @@ en = {
       "privacy-dontsend-option" : "Don't send",
       "filename-privacy-label" : "Filename information:",
       "filesize-privacy-label" : "File size information:",
-      "checkforupdatesautomatically-label" : "Check for updates automatically",
+      "checkforupdatesautomatically-label" : "Check for Syncplay updates automatically",
       "slowondesync-label" : "Slow down on minor desync (not supported on MPC-HC)",
-      "rewindondesync-label" : "Rewind on major desync (highly recommended)",
+      "rewindondesync-label" : "Rewind on major desync (recommended)",
       "fastforwardondesync-label" : "Fast-forward if lagging behind (recommended)",
       "dontslowdownwithme-label" : "Never slow down or rewind others (experimental)",
       "pauseonleave-label" : "Pause when user leaves (e.g. if they are disconnected)",
       "readyatstart-label" : "Set me as 'ready to watch' by default",
-      "forceguiprompt-label" : "Don't always show this dialog", # (Inverted)
+      "forceguiprompt-label" : "Don't always show the Syncplay configuration window", # (Inverted)
       "nostore-label" : "Don't store this configuration", # (Inverted)
       "showosd-label" : "Enable OSD Messages",
 
@@ -185,17 +185,20 @@ en = {
       "showdifferentroomosd-label" : "Include events in other rooms",
       "showslowdownosd-label" :"Include slowing down / reverting notifications",
       "showcontactinfo-label" : "Show contact info box",
-      "language-label" : "Language",
+      "language-label" : "Language:",
       "automatic-language" : "Automatic ({})", # Automatic language #
       "showdurationnotification-label" : "Warn about media duration mismatches",
       "basics-label" : "Basics",
+      "misc-label" : u"Misc",
+      "core-behaviour-title" : "Core room behaviour",
+      "syncplay-internals-title" : u"Syncplay internals",
       "sync-label" : "Sync",
-      "sync-lagging-title" : "If others are lagging behind...",
-      "sync-other-title" : "Other sync options",
+      "sync-otherslagging-title" : "If others are lagging behind...",
+      "sync-youlaggging-title" : "If you are lagging behind...",
       "messages-label" : "Messages",
       "messages-osd-title" : "On-screen Display settings",
       "messages-other-title" : "Other display settings",
-      "privacy-label" : "Privacy",
+      "privacy-label" : "Privacy", # Currently unused, but will be brought back if more space is needed in Misc tab
       "privacy-title" : "Privacy settings",
 
       "help-label" : "Help",
@@ -522,13 +525,16 @@ ru = {
       "showdifferentroomosd-label" : u"Показывать события других комнат",
       "showslowdownosd-label" : u"Показывать уведомления о замедлении/перемотке",
       "showcontactinfo-label" : u"Отображать контактную информацию разработчиков",
-      "language-label" : u"Language", # TODO: Translate into Russian
+      "language-label" : u"Language:", # TODO: Translate into Russian
       "automatic-language" : u"Automatic ({})", # Automatic language # TODO: Translate into Russian
       "showdurationnotification-label" : u"Предупреждать о несовпадении продолжительности видео",
       "basics-label" : u"Основное",
+      "misc-label" : u"Misc", # TODO: Translate into Russian
+      "core-behaviour-title" : "Core room behaviour", # TODO: Translate into Russian
+      "syncplay-internals-title" : u"Syncplay internals", # TODO: Translate into Russian
       "sync-label" : u"Синхронизация",
-      "sync-lagging-title" : u"If others are lagging behind...", # TODO: Translate into Russian
-      "sync-other-title" : u"Other sync options", # TODO: Translate into Russian
+      "sync-otherslagging-title" : u"If others are lagging behind...", # TODO: Translate into Russian
+      "sync-youlaggging-title" : u"If you are lagging behind...", # TODO: Translate into Russian
       "messages-label" : u"Сообщения",
       "messages-osd-title" : u"On-screen Display settings", # TODO: Translate into Russian
       "messages-other-title" : u"Other display settings", # TODO: Translate into Russian
@@ -857,13 +863,16 @@ de = {
       "showdifferentroomosd-label" : u"Zeige Ereignisse in anderen Räumen",
       "showslowdownosd-label" : u"Zeige Verlangsamungs/Zurücksetzungs-Benachrichtigung",
       "showcontactinfo-label" : u"Zeige Kontaktinformationen",
-      "language-label" : u"Sprache",
+      "language-label" : u"Sprache:",
       "automatic-language" : u"Automatisch ({})", # Automatic language
       "showdurationnotification-label" : u"Zeige Warnung wegen unterschiedlicher Dauer",
       "basics-label" : u"Basics",
+      "misc-label" : u"Misc", # TODO: Translate into German
+      "core-behaviour-title" : u"Core room behaviour", # TODO: Translate into German
+      "syncplay-internals-title" : u"Syncplay internals", # TODO: Translate into German
       "sync-label" : u"Synchronisation",
-      "sync-lagging-title" : u"Wenn andere laggen...",
-      "sync-other-title" : u"Weitere Synchronisationsoptionen",
+      "sync-otherslagging-title" : u"Wenn andere laggen...",
+      "sync-youlaggging-title" : u"If you are lagging behind...", # TODO: Translate into German
       "messages-label" : u"Nachrichten",
       "messages-osd-title" : u"OSD-(OnScreenDisplay)-Einstellungen",
       "messages-other-title" : u"Weitere Display-Einstellungen",
diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py
index adbf1b6..9fa086e 100644
--- a/syncplay/ui/GuiConfiguration.py
+++ b/syncplay/ui/GuiConfiguration.py
@@ -52,7 +52,6 @@ class ConfigDialog(QtGui.QDialog):
                 self.tabListFrame.show()
                 self.resetButton.show()
                 self.nostoreCheckbox.show()
-                self.alwaysshowCheckbox.show()
                 self.saveMoreState(True)
                 self.tabListWidget.setCurrentRow(0)
                 self.ensureTabListIsVisible()
@@ -60,7 +59,6 @@ class ConfigDialog(QtGui.QDialog):
                 self.tabListFrame.hide()
                 self.resetButton.hide()
                 self.nostoreCheckbox.hide()
-                self.alwaysshowCheckbox.hide()
                 self.saveMoreState(False)
                 self.stackedLayout.setCurrentIndex(0)
 
@@ -465,18 +463,104 @@ class ConfigDialog(QtGui.QDialog):
         self.connectionSettingsGroup.setMaximumHeight(self.connectionSettingsGroup.minimumSizeHint().height())
         self.basicOptionsLayout.setAlignment(Qt.AlignTop)
         self.basicOptionsLayout.addWidget(self.connectionSettingsGroup)
-        self.basicOptionsLayout.addSpacing(17)
+        self.basicOptionsLayout.addSpacing(5)
         self.mediaplayerSettingsGroup.setMaximumHeight(self.mediaplayerSettingsGroup.minimumSizeHint().height())
         self.basicOptionsLayout.addWidget(self.mediaplayerSettingsGroup)
 
         self.basicOptionsFrame.setLayout(self.basicOptionsLayout)
         self.stackedLayout.addWidget(self.basicOptionsFrame)
 
+    def addMiscTab(self):
+        self.miscFrame = QtGui.QFrame()
+        self.miscLayout = QtGui.QVBoxLayout()
+        self.miscFrame.setLayout(self.miscLayout)
+
+        self.coreSettingsGroup = QtGui.QGroupBox(getMessage("core-behaviour-title"))
+        self.coreSettingsLayout = QtGui.QVBoxLayout()
+        self.coreSettingsGroup.setLayout(self.coreSettingsLayout)
+
+        self.pauseonleaveCheckbox = QCheckBox(getMessage("pauseonleave-label"))
+        self.pauseonleaveCheckbox.setObjectName("pauseOnLeave")
+        self.coreSettingsLayout.addWidget(self.pauseonleaveCheckbox)
+
+        self.readyatstartCheckbox = QCheckBox(getMessage("readyatstart-label"))
+        self.readyatstartCheckbox.setObjectName("readyAtStart")
+        self.coreSettingsLayout.addWidget(self.readyatstartCheckbox)
+
+        self.internalSettingsGroup = QtGui.QGroupBox(getMessage("syncplay-internals-title"))
+        self.internalSettingsLayout = QtGui.QVBoxLayout()
+        self.internalSettingsGroup.setLayout(self.internalSettingsLayout)
+
+        self.alwaysshowCheckbox = QCheckBox(getMessage("forceguiprompt-label"))
+        self.alwaysshowCheckbox.setObjectName(constants.INVERTED_STATE_MARKER + "forceGuiPrompt")
+        self.internalSettingsLayout.addWidget(self.alwaysshowCheckbox)
+
+        self.automaticupdatesCheckbox = QCheckBox(getMessage("checkforupdatesautomatically-label"))
+        self.automaticupdatesCheckbox.setObjectName("checkForUpdatesAutomatically")
+        self.internalSettingsLayout.addWidget(self.automaticupdatesCheckbox)
+
+        ### Privacy:
+
+        self.privacySettingsGroup = QtGui.QGroupBox(getMessage("privacy-title"))
+        self.privacySettingsLayout = QtGui.QVBoxLayout()
+        self.privacySettingsFrame = QtGui.QFrame()
+        self.privacyFrame = QtGui.QFrame()
+        self.privacyLayout = QtGui.QGridLayout()
+
+        self.filenameprivacyLabel = QLabel(getMessage("filename-privacy-label"), self)
+        self.filenameprivacyButtonGroup = QButtonGroup()
+        self.filenameprivacySendRawOption = QRadioButton(getMessage("privacy-sendraw-option"))
+        self.filenameprivacySendHashedOption = QRadioButton(getMessage("privacy-sendhashed-option"))
+        self.filenameprivacyDontSendOption = QRadioButton(getMessage("privacy-dontsend-option"))
+        self.filenameprivacyButtonGroup.addButton(self.filenameprivacySendRawOption)
+        self.filenameprivacyButtonGroup.addButton(self.filenameprivacySendHashedOption)
+        self.filenameprivacyButtonGroup.addButton(self.filenameprivacyDontSendOption)
+
+        self.filesizeprivacyLabel = QLabel(getMessage("filesize-privacy-label"), self)
+        self.filesizeprivacyButtonGroup = QButtonGroup()
+        self.filesizeprivacySendRawOption = QRadioButton(getMessage("privacy-sendraw-option"))
+        self.filesizeprivacySendHashedOption = QRadioButton(getMessage("privacy-sendhashed-option"))
+        self.filesizeprivacyDontSendOption = QRadioButton(getMessage("privacy-dontsend-option"))
+        self.filesizeprivacyButtonGroup.addButton(self.filesizeprivacySendRawOption)
+        self.filesizeprivacyButtonGroup.addButton(self.filesizeprivacySendHashedOption)
+        self.filesizeprivacyButtonGroup.addButton(self.filesizeprivacyDontSendOption)
+
+        self.filenameprivacyLabel.setObjectName("filename-privacy")
+        self.filenameprivacySendRawOption.setObjectName("privacy-sendraw" + constants.CONFIG_NAME_MARKER + "filenamePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_SENDRAW_MODE)
+        self.filenameprivacySendHashedOption.setObjectName("privacy-sendhashed" + constants.CONFIG_NAME_MARKER + "filenamePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_SENDHASHED_MODE)
+        self.filenameprivacyDontSendOption.setObjectName("privacy-dontsend" + constants.CONFIG_NAME_MARKER + "filenamePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_DONTSEND_MODE)
+        self.filesizeprivacyLabel.setObjectName("filesize-privacy")
+        self.filesizeprivacySendRawOption.setObjectName("privacy-sendraw" + constants.CONFIG_NAME_MARKER + "filesizePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_SENDRAW_MODE)
+        self.filesizeprivacySendHashedOption.setObjectName("privacy-sendhashed" + constants.CONFIG_NAME_MARKER + "filesizePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_SENDHASHED_MODE)
+        self.filesizeprivacyDontSendOption.setObjectName("privacy-dontsend" + constants.CONFIG_NAME_MARKER + "filesizePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_DONTSEND_MODE)
+
+        self.privacyLayout.addWidget(self.filenameprivacyLabel, 1, 0)
+        self.privacyLayout.addWidget(self.filenameprivacySendRawOption, 1, 1, Qt.AlignLeft)
+        self.privacyLayout.addWidget(self.filenameprivacySendHashedOption, 1, 2, Qt.AlignLeft)
+        self.privacyLayout.addWidget(self.filenameprivacyDontSendOption, 1, 3, Qt.AlignLeft)
+        self.privacyLayout.addWidget(self.filesizeprivacyLabel, 2, 0)
+        self.privacyLayout.addWidget(self.filesizeprivacySendRawOption, 2, 1, Qt.AlignLeft)
+        self.privacyLayout.addWidget(self.filesizeprivacySendHashedOption, 2, 2, Qt.AlignLeft)
+        self.privacyLayout.addWidget(self.filesizeprivacyDontSendOption, 2, 3, Qt.AlignLeft)
+
+        self.privacyFrame.setLayout(self.privacyLayout)
+        self.privacySettingsGroup.setLayout(self.privacyLayout)
+        self.privacySettingsGroup.setMaximumHeight(self.privacySettingsGroup.minimumSizeHint().height())
+        self.privacySettingsLayout.addWidget(self.privacySettingsGroup)
+        self.privacySettingsLayout.setAlignment(Qt.AlignTop)
+        self.privacyFrame.setLayout(self.privacySettingsLayout)
+
+        self.miscLayout.addWidget(self.coreSettingsGroup)
+        self.miscLayout.addWidget(self.internalSettingsGroup)
+        self.miscLayout.addWidget(self.privacySettingsGroup)
+        self.miscLayout.setAlignment(Qt.AlignTop)
+        self.stackedLayout.addWidget(self.miscFrame)
+
     def addSyncTab(self):
         self.syncSettingsFrame = QtGui.QFrame()
         self.syncSettingsLayout = QtGui.QVBoxLayout()
 
-        self.desyncSettingsGroup = QtGui.QGroupBox(getMessage("sync-lagging-title"))
+        self.desyncSettingsGroup = QtGui.QGroupBox(getMessage("sync-otherslagging-title"))
         self.desyncOptionsFrame = QtGui.QFrame()
         self.desyncSettingsOptionsLayout = QtGui.QHBoxLayout()
         config = self.config
@@ -565,21 +649,13 @@ class ConfigDialog(QtGui.QDialog):
         self.desyncSettingsLayout.setAlignment(Qt.AlignLeft)
         self.desyncSettingsGroup.setLayout(self.desyncSettingsLayout)
         self.desyncSettingsOptionsLayout.addWidget(self.desyncFrame)
-        self.syncSettingsLayout.addWidget(self.desyncSettingsGroup)
+
         self.desyncFrame.setLayout(self.syncSettingsLayout)
 
-        self.othersyncSettingsGroup = QtGui.QGroupBox(getMessage("sync-other-title"))
+        self.othersyncSettingsGroup = QtGui.QGroupBox(getMessage("sync-youlaggging-title"))
         self.othersyncOptionsFrame = QtGui.QFrame()
         self.othersyncSettingsLayout = QtGui.QGridLayout()
 
-        self.pauseonleaveCheckbox = QCheckBox(getMessage("pauseonleave-label"))
-        self.othersyncSettingsLayout.addWidget(self.pauseonleaveCheckbox, 1, 0, 1, 2, Qt.AlignLeft)
-        self.pauseonleaveCheckbox.setObjectName("pauseOnLeave")
-
-        self.readyatstartCheckbox = QCheckBox(getMessage("readyatstart-label"))
-        self.othersyncSettingsLayout.addWidget(self.readyatstartCheckbox, 2, 0, 1, 2, Qt.AlignLeft)
-        self.readyatstartCheckbox.setObjectName("readyAtStart")
-
         self.dontslowwithmeCheckbox = QCheckBox(getMessage("dontslowdownwithme-label"))
         self.dontslowwithmeCheckbox.setObjectName("dontSlowDownWithMe")
 
@@ -588,6 +664,7 @@ class ConfigDialog(QtGui.QDialog):
         self.fastforwardThresholdLabel.setObjectName("fastforward-threshold")
         self.fastforwardThresholdSpinbox.setObjectName("fastforward-threshold")
 
+        self.othersyncSettingsLayout.setAlignment(Qt.AlignLeft)
         self.othersyncSettingsLayout.addWidget(self.fastforwardCheckbox, 4, 0,1,2, Qt.AlignLeft)
         self.othersyncSettingsLayout.addWidget(self.fastforwardThresholdLabel, 5, 0, 1, 1, Qt.AlignLeft)
         self.othersyncSettingsLayout.addWidget(self.fastforwardThresholdSpinbox, 5, 1, Qt.AlignLeft)
@@ -596,7 +673,7 @@ class ConfigDialog(QtGui.QDialog):
         self.othersyncSettingsGroup.setLayout(self.othersyncSettingsLayout)
         self.othersyncSettingsGroup.setMaximumHeight(self.othersyncSettingsGroup.minimumSizeHint().height())
         self.syncSettingsLayout.addWidget(self.othersyncSettingsGroup)
-
+        self.syncSettingsLayout.addWidget(self.desyncSettingsGroup)
         self.syncSettingsFrame.setLayout(self.syncSettingsLayout)
         self.desyncSettingsGroup.setMaximumHeight(self.desyncSettingsGroup.minimumSizeHint().height())
         self.syncSettingsLayout.setAlignment(Qt.AlignTop)
@@ -605,6 +682,7 @@ class ConfigDialog(QtGui.QDialog):
     def addMessageTab(self):
         self.messageFrame = QtGui.QFrame()
         self.messageLayout = QtGui.QVBoxLayout()
+        self.messageLayout.setAlignment(Qt.AlignTop)
 
         # OSD
         self.osdSettingsGroup = QtGui.QGroupBox(getMessage("messages-osd-title"))
@@ -650,34 +728,17 @@ class ConfigDialog(QtGui.QDialog):
         # Other display
 
         self.displaySettingsGroup = QtGui.QGroupBox(getMessage("messages-other-title"))
-        self.displaySettingsLayout = QtGui.QGridLayout()
+        self.displaySettingsLayout = QtGui.QVBoxLayout()
         self.displaySettingsLayout.setAlignment(Qt.AlignTop)
         self.displaySettingsFrame = QtGui.QFrame()
 
         self.showDurationNotificationCheckbox = QCheckBox(getMessage("showdurationnotification-label"))
         self.showDurationNotificationCheckbox.setObjectName("showDurationNotification")
-        self.displaySettingsLayout.addWidget(self.showDurationNotificationCheckbox, 0, 0, 1, 2)
+        self.displaySettingsLayout.addWidget(self.showDurationNotificationCheckbox)
 
         self.showcontactinfoCheckbox = QCheckBox(getMessage("showcontactinfo-label"))
         self.showcontactinfoCheckbox.setObjectName("showContactInfo")
-        self.displaySettingsLayout.addWidget(self.showcontactinfoCheckbox, 1, 0, 1, 2)
-
-        self.languageLabel = QLabel(getMessage("language-label"), self)
-        self.languageCombobox = QtGui.QComboBox(self)
-        self.languageCombobox.addItem(getMessage("automatic-language").format(getMessage("LANGUAGE", getInitialLanguage())))
-
-        self.languages = getLanguages()
-        for lang in self.languages:
-            self.languageCombobox.addItem(self.languages[lang], lang)
-            if lang == self.config['language']:
-                self.languageCombobox.setCurrentIndex(self.languageCombobox.count()-1)
-        self.languageCombobox.currentIndexChanged.connect(self.languageChanged)
-        self.displaySettingsLayout.addWidget(self.languageLabel, 2, 0, 1, 1)
-        self.displaySettingsLayout.addWidget(self.languageCombobox, 2, 1, 1, 1)
-
-        self.languageLabel.setObjectName("language")
-        self.languageCombobox.setObjectName("language")
-
+        self.displaySettingsLayout.addWidget(self.showcontactinfoCheckbox)
 
         self.displaySettingsGroup.setLayout(self.displaySettingsLayout)
         self.displaySettingsGroup.setMaximumHeight(self.displaySettingsGroup.minimumSizeHint().height())
@@ -688,61 +749,6 @@ class ConfigDialog(QtGui.QDialog):
         self.messageFrame.setLayout(self.messageLayout)
         self.stackedLayout.addWidget(self.messageFrame)
 
-    def addPrivacyTab(self):
-        self.privacySettingsGroup = QtGui.QGroupBox(getMessage("privacy-title"))
-        self.privacySettingsLayout = QtGui.QVBoxLayout()
-        self.privacySettingsFrame = QtGui.QFrame()
-        self.privacyFrame = QtGui.QFrame()
-        self.privacyLayout = QtGui.QGridLayout()
-
-        self.filenameprivacyLabel = QLabel(getMessage("filename-privacy-label"), self)
-        self.filenameprivacyButtonGroup = QButtonGroup()
-        self.filenameprivacySendRawOption = QRadioButton(getMessage("privacy-sendraw-option"))
-        self.filenameprivacySendHashedOption = QRadioButton(getMessage("privacy-sendhashed-option"))
-        self.filenameprivacyDontSendOption = QRadioButton(getMessage("privacy-dontsend-option"))
-        self.filenameprivacyButtonGroup.addButton(self.filenameprivacySendRawOption)
-        self.filenameprivacyButtonGroup.addButton(self.filenameprivacySendHashedOption)
-        self.filenameprivacyButtonGroup.addButton(self.filenameprivacyDontSendOption)
-
-        self.filesizeprivacyLabel = QLabel(getMessage("filesize-privacy-label"), self)
-        self.filesizeprivacyButtonGroup = QButtonGroup()
-        self.filesizeprivacySendRawOption = QRadioButton(getMessage("privacy-sendraw-option"))
-        self.filesizeprivacySendHashedOption = QRadioButton(getMessage("privacy-sendhashed-option"))
-        self.filesizeprivacyDontSendOption = QRadioButton(getMessage("privacy-dontsend-option"))
-        self.filesizeprivacyButtonGroup.addButton(self.filesizeprivacySendRawOption)
-        self.filesizeprivacyButtonGroup.addButton(self.filesizeprivacySendHashedOption)
-        self.filesizeprivacyButtonGroup.addButton(self.filesizeprivacyDontSendOption)
-
-        self.filenameprivacyLabel.setObjectName("filename-privacy")
-        self.filenameprivacySendRawOption.setObjectName("privacy-sendraw" + constants.CONFIG_NAME_MARKER + "filenamePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_SENDRAW_MODE)
-        self.filenameprivacySendHashedOption.setObjectName("privacy-sendhashed" + constants.CONFIG_NAME_MARKER + "filenamePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_SENDHASHED_MODE)
-        self.filenameprivacyDontSendOption.setObjectName("privacy-dontsend" + constants.CONFIG_NAME_MARKER + "filenamePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_DONTSEND_MODE)
-        self.filesizeprivacyLabel.setObjectName("filesize-privacy")
-        self.filesizeprivacySendRawOption.setObjectName("privacy-sendraw" + constants.CONFIG_NAME_MARKER + "filesizePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_SENDRAW_MODE)
-        self.filesizeprivacySendHashedOption.setObjectName("privacy-sendhashed" + constants.CONFIG_NAME_MARKER + "filesizePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_SENDHASHED_MODE)
-        self.filesizeprivacyDontSendOption.setObjectName("privacy-dontsend" + constants.CONFIG_NAME_MARKER + "filesizePrivacyMode" + constants.CONFIG_VALUE_MARKER + constants.PRIVACY_DONTSEND_MODE)
-
-        self.automaticupdatesCheckbox = QCheckBox(getMessage("checkforupdatesautomatically-label"))
-        self.automaticupdatesCheckbox.setObjectName("checkForUpdatesAutomatically")
-
-        self.privacyLayout.addWidget(self.filenameprivacyLabel, 1, 0)
-        self.privacyLayout.addWidget(self.filenameprivacySendRawOption, 1, 1, Qt.AlignLeft)
-        self.privacyLayout.addWidget(self.filenameprivacySendHashedOption, 1, 2, Qt.AlignLeft)
-        self.privacyLayout.addWidget(self.filenameprivacyDontSendOption, 1, 3, Qt.AlignLeft)
-        self.privacyLayout.addWidget(self.filesizeprivacyLabel, 2, 0)
-        self.privacyLayout.addWidget(self.filesizeprivacySendRawOption, 2, 1, Qt.AlignLeft)
-        self.privacyLayout.addWidget(self.filesizeprivacySendHashedOption, 2, 2, Qt.AlignLeft)
-        self.privacyLayout.addWidget(self.filesizeprivacyDontSendOption, 2, 3, Qt.AlignLeft)
-        self.privacyLayout.addWidget(self.automaticupdatesCheckbox, 3, 0, 1, 3, Qt.AlignLeft)
-
-        self.privacyFrame.setLayout(self.privacyLayout)
-        self.privacySettingsGroup.setLayout(self.privacyLayout)
-        self.privacySettingsGroup.setMaximumHeight(self.privacySettingsGroup.minimumSizeHint().height())
-        self.privacySettingsLayout.addWidget(self.privacySettingsGroup)
-        self.privacySettingsLayout.setAlignment(Qt.AlignTop)
-        self.privacyFrame.setLayout(self.privacySettingsLayout)
-        self.stackedLayout.addWidget(self.privacyFrame)
-
     def addBottomLayout(self):
         config = self.config
         resourcespath = self.resourcespath
@@ -772,14 +778,40 @@ class ConfigDialog(QtGui.QDialog):
 
         self.bottomCheckboxFrame = QtGui.QFrame()
         self.bottomCheckboxFrame.setContentsMargins(0,0,0,0)
-        self.bottomCheckboxLayout = QtGui.QGridLayout()
-        self.alwaysshowCheckbox = QCheckBox(getMessage("forceguiprompt-label"))
+        self.bottomCheckboxLayout = QtGui.QHBoxLayout()
+
+        self.languageFrame = QtGui.QFrame()
+        self.languageLayout = QtGui.QGridLayout()
+        self.languageFrame.setLayout(self.languageLayout)
+        self.languageLayout.setAlignment(Qt.AlignRight)
 
         self.nostoreCheckbox = QCheckBox(getMessage("nostore-label"))
-        self.bottomCheckboxLayout.addWidget(self.showmoreCheckbox)
-        self.bottomCheckboxLayout.addWidget(self.alwaysshowCheckbox, 0, 1, Qt.AlignLeft)
-        self.bottomCheckboxLayout.addWidget(self.nostoreCheckbox, 0, 2, Qt.AlignRight)
-        self.alwaysshowCheckbox.setObjectName(constants.INVERTED_STATE_MARKER + "forceGuiPrompt")
+
+        self.morenostoreFrame = QtGui.QFrame()
+        self.morenostoreLayout = QtGui.QHBoxLayout()
+        self.morenostoreLayout.setContentsMargins(0,0,0,0)
+        self.morenostoreFrame.setLayout(self.morenostoreLayout)
+        self.morenostoreLayout.setAlignment(Qt.AlignLeft)
+        self.morenostoreLayout.addWidget(self.showmoreCheckbox, Qt.AlignLeft)
+        self.morenostoreLayout.addWidget(self.nostoreCheckbox, Qt.AlignLeft)
+
+        self.languageLayout.setContentsMargins(0,0,0,0)
+        self.languageLabel = QLabel(getMessage("language-label"), self)
+        self.languageCombobox = QtGui.QComboBox(self)
+        self.languageCombobox.addItem(getMessage("automatic-language").format(getMessage("LANGUAGE", getInitialLanguage())))
+        self.languageCombobox.setObjectName("language")
+        self.languageLabel.setObjectName("language")
+
+        self.languages = getLanguages()
+        for lang in self.languages:
+            self.languageCombobox.addItem(self.languages[lang], lang)
+            if lang == self.config['language']:
+                self.languageCombobox.setCurrentIndex(self.languageCombobox.count()-1)
+        self.languageCombobox.currentIndexChanged.connect(self.languageChanged)
+        self.languageLayout.addWidget(self.languageLabel, Qt.AlignRight, 0, 0)
+        self.languageLayout.addWidget(self.languageCombobox, Qt.AlignRight, 1, 0)
+        self.bottomCheckboxLayout.addWidget(self.morenostoreFrame, Qt.AlignRight)
+        self.bottomCheckboxLayout.addWidget(self.languageFrame, Qt.AlignRight)
         self.nostoreCheckbox.setObjectName("noStore")
         self.nostoreCheckbox.toggled.connect(self.runButtonTextUpdate)
         self.bottomCheckboxFrame.setLayout(self.bottomCheckboxLayout)
@@ -790,9 +822,9 @@ class ConfigDialog(QtGui.QDialog):
         self.tabListFrame = QtGui.QFrame()
         self.tabListWidget = QtGui.QListWidget()
         self.tabListWidget.addItem(QtGui.QListWidgetItem(QtGui.QIcon(self.resourcespath + "house.png"),getMessage("basics-label")))
+        self.tabListWidget.addItem(QtGui.QListWidgetItem(QtGui.QIcon(self.resourcespath + "cog.png"),getMessage("misc-label")))
         self.tabListWidget.addItem(QtGui.QListWidgetItem(QtGui.QIcon(self.resourcespath + "film_link.png"),getMessage("sync-label")))
         self.tabListWidget.addItem(QtGui.QListWidgetItem(QtGui.QIcon(self.resourcespath + "comments.png"),getMessage("messages-label")))
-        self.tabListWidget.addItem(QtGui.QListWidgetItem(QtGui.QIcon(self.resourcespath + "eye.png"),getMessage("privacy-label")))
         self.tabListLayout.addWidget(self.tabListWidget)
         self.tabListFrame.setLayout(self.tabListLayout)
         self.tabListFrame.setFixedWidth(self.tabListFrame.minimumSizeHint().width())
@@ -822,7 +854,6 @@ class ConfigDialog(QtGui.QDialog):
         self.ensureTabListIsVisible()
         self.setFixedWidth(self.minimumSizeHint().width())
         self.executablepathCombobox.setFixedWidth(self.mediapathTextbox.width())
-        self.languageLabel.setFixedWidth(self.languageLabel.width())
 
     def clearGUIData(self, leaveMore=False):
         settings = QSettings("Syncplay", "PlayerList")
@@ -878,9 +909,9 @@ class ConfigDialog(QtGui.QDialog):
         self.mainLayout.setContentsMargins(0,0,0,0)
 
         self.addBasicTab()
+        self.addMiscTab()
         self.addSyncTab()
         self.addMessageTab()
-        self.addPrivacyTab()
         self.tabList()
 
         self.mainLayout.addWidget(self.stackedFrame, 0, 1)
@@ -890,7 +921,6 @@ class ConfigDialog(QtGui.QDialog):
         if self.getMoreState() == False:
             self.tabListFrame.hide()
             self.nostoreCheckbox.hide()
-            self.alwaysshowCheckbox.hide()
             self.resetButton.hide()
         else:
             self.showmoreCheckbox.setChecked(True)