From 9538dc456edd34fe3c41edd03ace11b0a25ef5bb Mon Sep 17 00:00:00 2001 From: daniel-123 Date: Tue, 25 Jun 2013 15:07:59 +0200 Subject: [PATCH] Consistent string capitalisation across Syncplay. --- syncplay/messages.py | 4 ++-- syncplay/ui/GuiConfiguration.py | 22 +++++++++++----------- syncplay/ui/gui.py | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/syncplay/messages.py b/syncplay/messages.py index 2d4e160..485876f 100644 --- a/syncplay/messages.py +++ b/syncplay/messages.py @@ -37,7 +37,7 @@ en = { "mplayer-file-required-notification" : "Syncplay using mplayer requires you to provide file when starting", "mplayer-file-required-notification/example" : "Usage example: syncplay [options] [url|path/]filename", - "mplayer2-required" : "Syncplay is incompatible with MPlayer 1.x, please use mplayer2", + "mplayer2-required" : "Syncplay is incompatible with MPlayer 1.x, please use mplayer2 or mpv", "unrecognized-command-notification" : "Unrecognized command", "commandlist-notification" : "Available commands:", @@ -90,7 +90,7 @@ en = { "args-argument" : 'player options, if you need to pass options starting with - prepend them with single \'--\' argument', # Client labels - "config-window-title" : 'Syncplay Configuration', + "config-window-title" : 'Syncplay configuration', "host-label" : 'Host: ', "username-label" : 'Username: ', "room-label" : 'Default room: ', diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index 776ac10..12ddcf1 100644 --- a/syncplay/ui/GuiConfiguration.py +++ b/syncplay/ui/GuiConfiguration.py @@ -94,10 +94,10 @@ class ConfigDialog(QtGui.QDialog): def browsePlayerpath(self): options = QtGui.QFileDialog.Options() defaultdirectory = "" - browserfilter = "All Files (*)" + browserfilter = "All files (*)" if os.name == 'nt': - browserfilter = "Executable files (*.exe);;All Files (*)" + browserfilter = "Executable files (*.exe);;All files (*)" if "PROGRAMFILES(X86)" in os.environ: defaultdirectory = os.environ["ProgramFiles(x86)"] elif "PROGRAMFILES" in os.environ: @@ -137,7 +137,7 @@ class ConfigDialog(QtGui.QDialog): defaultdirectory = QDesktopServices.storageLocation(QDesktopServices.HomeLocation) else: defaultdirectory = "" - browserfilter = "All Files (*)" + browserfilter = "All files (*)" fileName, filtr = QtGui.QFileDialog.getOpenFileName(self,"Browse for media files",defaultdirectory, browserfilter, "", options) if fileName: @@ -227,7 +227,7 @@ class ConfigDialog(QtGui.QDialog): else: host = config['host']+":"+str(config['port']) - self.connectionSettingsGroup = QtGui.QGroupBox("Connection Settings") + self.connectionSettingsGroup = QtGui.QGroupBox("Connection settings") self.hostTextbox = QLineEdit(host, self) self.hostLabel = QLabel(getMessage("en", "host-label"), self) self.usernameTextbox = QLineEdit(config['name'],self) @@ -247,7 +247,7 @@ class ConfigDialog(QtGui.QDialog): self.connectionSettingsLayout.addWidget(self.defaultroomTextbox, 3, 1) self.connectionSettingsGroup.setLayout(self.connectionSettingsLayout) - self.mediaplayerSettingsGroup = QtGui.QGroupBox("Media Player Settings") + self.mediaplayerSettingsGroup = QtGui.QGroupBox("Media player settings") self.executablepathCombobox = QtGui.QComboBox(self) self.executablepathCombobox.setEditable(True) self.executablepathCombobox.setEditText(self._tryToFillPlayerPath(config['playerPath'],playerpaths)) @@ -273,15 +273,15 @@ class ConfigDialog(QtGui.QDialog): if config['slowOnDesync'] == True: self.slowdownCheckbox.setChecked(True) - self.malSettingsGroup = QtGui.QGroupBox("Enable MyAnimeList Updater (EXPERIMENTAL)") + self.malSettingsGroup = QtGui.QGroupBox("Enable MyAnimeList updater (EXPERIMENTAL)") self.malSettingsGroup.setCheckable(True) self.malSettingsGroup.toggled.connect(self.malToggled) self.malSettingsSplit = QtGui.QSplitter(self) self.malusernameTextbox = QLineEdit(config['malUsername'],self) - self.malusernameLabel = QLabel("MAL Username:", self) + self.malusernameLabel = QLabel("MAL username:", self) self.malpasswordTextbox = QLineEdit(config['malPassword'],self) self.malpasswordTextbox.setEchoMode(QtGui.QLineEdit.Password) - self.malpasswordLabel = QLabel("MAL Password:", self) + self.malpasswordLabel = QLabel("MAL password:", self) self.malSettingsLayout = QtGui.QGridLayout() self.malSettingsLayout.addWidget(self.malusernameLabel , 0, 0) self.malSettingsLayout.addWidget(self.malusernameTextbox, 0, 1) @@ -289,7 +289,7 @@ class ConfigDialog(QtGui.QDialog): self.malSettingsLayout.addWidget(self.malpasswordTextbox, 1, 1) self.malSettingsGroup.setLayout(self.malSettingsLayout) - self.malenabledCheckbox = QCheckBox("Enable MyAnimeList Updater (EXPERIMENTAL)") + self.malenabledCheckbox = QCheckBox("Enable MyAnimeList updater (EXPERIMENTAL)") self.malenabledCheckbox.toggled.connect(self.malToggled) if config['malPassword'] == None or config['malPassword'] == "": self.malenabledCheckbox.setChecked(False) @@ -297,11 +297,11 @@ class ConfigDialog(QtGui.QDialog): else: self.malenabledCheckbox.hide() - self.alwaysshowCheckbox = QCheckBox("Always Show This Dialog") + self.alwaysshowCheckbox = QCheckBox("Always show this dialog") if config['forceGuiPrompt'] == True: self.alwaysshowCheckbox.setChecked(True) - self.donotstoreCheckbox = QCheckBox("Do Not Store This Configuration") + self.donotstoreCheckbox = QCheckBox("Do not store this configuration") self.donotstoreCheckbox.toggled.connect(self.runButtonTextUpdate) self.mainLayout = QtGui.QVBoxLayout() diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index b50d56c..9b3b927 100644 --- a/syncplay/ui/gui.py +++ b/syncplay/ui/gui.py @@ -158,7 +158,7 @@ class MainWindow(QtGui.QMainWindow): defaultdirectory = QtGui.QDesktopServices.storageLocation(QtGui.QDesktopServices.HomeLocation) else: defaultdirectory = "" - browserfilter = "All Files (*)" + browserfilter = "All files (*)" fileName, filtr = QtGui.QFileDialog.getOpenFileName(self,"Browse for media files",defaultdirectory, browserfilter, "", options) if fileName: @@ -178,7 +178,7 @@ class MainWindow(QtGui.QMainWindow): return None def setOffset(self): - newoffset, ok = QtGui.QInputDialog.getText(self,"Set Offset", + newoffset, ok = QtGui.QInputDialog.getText(self,"Set offset", "Offset (see http://syncplay.pl/guide/ for usage instructions):", QtGui.QLineEdit.Normal, "") if ok and newoffset != '': @@ -290,7 +290,7 @@ class MainWindow(QtGui.QMainWindow): window.seekGroup.setFixedSize(window.seekGroup.sizeHint()) def addMiscBox(self, window): - window.miscGroup = QtGui.QGroupBox("Other Commands") + window.miscGroup = QtGui.QGroupBox("Other commands") window.unseekButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'arrow_undo.png'),"Undo last seek") window.unseekButton.pressed.connect(self.undoSeek) @@ -309,19 +309,19 @@ class MainWindow(QtGui.QMainWindow): window.menuBar = QtGui.QMenuBar() window.fileMenu = QtGui.QMenu("&File", self) - window.openAction = window.fileMenu.addAction(QtGui.QIcon(self.resourcespath + 'folder_explore.png'), "&Open Media File") + window.openAction = window.fileMenu.addAction(QtGui.QIcon(self.resourcespath + 'folder_explore.png'), "&Open media file") window.openAction.triggered.connect(self.browseMediapath) window.exitAction = window.fileMenu.addAction(QtGui.QIcon(self.resourcespath + 'cross.png'), "E&xit") window.exitAction.triggered.connect(self.exitSyncplay) window.menuBar.addMenu(window.fileMenu) window.advancedMenu = QtGui.QMenu("&Advanced", self) - window.setoffsetAction = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'timeline_marker.png'),"Set &Offset") + window.setoffsetAction = window.advancedMenu.addAction(QtGui.QIcon(self.resourcespath + 'timeline_marker.png'),"Set &offset") window.setoffsetAction.triggered.connect(self.setOffset) window.menuBar.addMenu(window.advancedMenu) window.helpMenu = QtGui.QMenu("&Help", self) - window.userguideAction = window.helpMenu.addAction(QtGui.QIcon(self.resourcespath + 'help.png'), "Open User &Guide") + window.userguideAction = window.helpMenu.addAction(QtGui.QIcon(self.resourcespath + 'help.png'), "Open user &guide") window.userguideAction.triggered.connect(self.openUserGuide) window.menuBar.addMenu(window.helpMenu)