Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Consistent string capitalisation across Syncplay.

Browse Source
This commit is contained in:
daniel-123 2013-06-25 15:07:59 +02:00
parent 98dcf88d4e
commit 9538dc456e
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syncplay/messages.py
View File

@ -37,7 +37,7 @@ en = {
"mplayer-file-required-notification" : "Syncplay using mplayer requires you to provide file when starting", "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", "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", "unrecognized-command-notification" : "Unrecognized command",
"commandlist-notification" : "Available commands:", "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', "args-argument" : 'player options, if you need to pass options starting with - prepend them with single \'--\' argument',
# Client labels # Client labels
"config-window-title" : 'Syncplay Configuration', "config-window-title" : 'Syncplay configuration',
"host-label" : 'Host: ', "host-label" : 'Host: ',
"username-label" : 'Username: ', "username-label" : 'Username: ',
"room-label" : 'Default room: ', "room-label" : 'Default room: ',

22
syncplay/ui/GuiConfiguration.py
View File

@ -94,10 +94,10 @@ class ConfigDialog(QtGui.QDialog):
def browsePlayerpath(self): def browsePlayerpath(self):
options = QtGui.QFileDialog.Options() options = QtGui.QFileDialog.Options()
defaultdirectory = "" defaultdirectory = ""
browserfilter = "All Files (*)" browserfilter = "All files (*)"
if os.name == 'nt': if os.name == 'nt':
browserfilter = "Executable files (*.exe);;All Files (*)" browserfilter = "Executable files (*.exe);;All files (*)"
if "PROGRAMFILES(X86)" in os.environ: if "PROGRAMFILES(X86)" in os.environ:
defaultdirectory = os.environ["ProgramFiles(x86)"] defaultdirectory = os.environ["ProgramFiles(x86)"]
elif "PROGRAMFILES" in os.environ: elif "PROGRAMFILES" in os.environ:
@ -137,7 +137,7 @@ class ConfigDialog(QtGui.QDialog):
defaultdirectory = QDesktopServices.storageLocation(QDesktopServices.HomeLocation) defaultdirectory = QDesktopServices.storageLocation(QDesktopServices.HomeLocation)
else: else:
defaultdirectory = "" defaultdirectory = ""
browserfilter = "All Files (*)" browserfilter = "All files (*)"
fileName, filtr = QtGui.QFileDialog.getOpenFileName(self,"Browse for media files",defaultdirectory, fileName, filtr = QtGui.QFileDialog.getOpenFileName(self,"Browse for media files",defaultdirectory,
browserfilter, "", options) browserfilter, "", options)
if fileName: if fileName:
@ -227,7 +227,7 @@ class ConfigDialog(QtGui.QDialog):
else: else:
host = config['host']+":"+str(config['port']) host = config['host']+":"+str(config['port'])
self.connectionSettingsGroup = QtGui.QGroupBox("Connection Settings") self.connectionSettingsGroup = QtGui.QGroupBox("Connection settings")
self.hostTextbox = QLineEdit(host, self) self.hostTextbox = QLineEdit(host, self)
self.hostLabel = QLabel(getMessage("en", "host-label"), self) self.hostLabel = QLabel(getMessage("en", "host-label"), self)
self.usernameTextbox = QLineEdit(config['name'],self) self.usernameTextbox = QLineEdit(config['name'],self)
@ -247,7 +247,7 @@ class ConfigDialog(QtGui.QDialog):
self.connectionSettingsLayout.addWidget(self.defaultroomTextbox, 3, 1) self.connectionSettingsLayout.addWidget(self.defaultroomTextbox, 3, 1)
self.connectionSettingsGroup.setLayout(self.connectionSettingsLayout) 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 = QtGui.QComboBox(self)
self.executablepathCombobox.setEditable(True) self.executablepathCombobox.setEditable(True)
self.executablepathCombobox.setEditText(self._tryToFillPlayerPath(config['playerPath'],playerpaths)) self.executablepathCombobox.setEditText(self._tryToFillPlayerPath(config['playerPath'],playerpaths))
@ -273,15 +273,15 @@ class ConfigDialog(QtGui.QDialog):
if config['slowOnDesync'] == True: if config['slowOnDesync'] == True:
self.slowdownCheckbox.setChecked(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.setCheckable(True)
self.malSettingsGroup.toggled.connect(self.malToggled) self.malSettingsGroup.toggled.connect(self.malToggled)
self.malSettingsSplit = QtGui.QSplitter(self) self.malSettingsSplit = QtGui.QSplitter(self)
self.malusernameTextbox = QLineEdit(config['malUsername'],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 = QLineEdit(config['malPassword'],self)
self.malpasswordTextbox.setEchoMode(QtGui.QLineEdit.Password) self.malpasswordTextbox.setEchoMode(QtGui.QLineEdit.Password)
self.malpasswordLabel = QLabel("MAL Password:", self) self.malpasswordLabel = QLabel("MAL password:", self)
self.malSettingsLayout = QtGui.QGridLayout() self.malSettingsLayout = QtGui.QGridLayout()
self.malSettingsLayout.addWidget(self.malusernameLabel , 0, 0) self.malSettingsLayout.addWidget(self.malusernameLabel , 0, 0)
self.malSettingsLayout.addWidget(self.malusernameTextbox, 0, 1) self.malSettingsLayout.addWidget(self.malusernameTextbox, 0, 1)
@ -289,7 +289,7 @@ class ConfigDialog(QtGui.QDialog):
self.malSettingsLayout.addWidget(self.malpasswordTextbox, 1, 1) self.malSettingsLayout.addWidget(self.malpasswordTextbox, 1, 1)
self.malSettingsGroup.setLayout(self.malSettingsLayout) 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) self.malenabledCheckbox.toggled.connect(self.malToggled)
if config['malPassword'] == None or config['malPassword'] == "": if config['malPassword'] == None or config['malPassword'] == "":
self.malenabledCheckbox.setChecked(False) self.malenabledCheckbox.setChecked(False)
@ -297,11 +297,11 @@ class ConfigDialog(QtGui.QDialog):
else: else:
self.malenabledCheckbox.hide() self.malenabledCheckbox.hide()
self.alwaysshowCheckbox = QCheckBox("Always Show This Dialog") self.alwaysshowCheckbox = QCheckBox("Always show this dialog")
if config['forceGuiPrompt'] == True: if config['forceGuiPrompt'] == True:
self.alwaysshowCheckbox.setChecked(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.donotstoreCheckbox.toggled.connect(self.runButtonTextUpdate)
self.mainLayout = QtGui.QVBoxLayout() self.mainLayout = QtGui.QVBoxLayout()

12
syncplay/ui/gui.py
View File

@ -158,7 +158,7 @@ class MainWindow(QtGui.QMainWindow):
defaultdirectory = QtGui.QDesktopServices.storageLocation(QtGui.QDesktopServices.HomeLocation) defaultdirectory = QtGui.QDesktopServices.storageLocation(QtGui.QDesktopServices.HomeLocation)
else: else:
defaultdirectory = "" defaultdirectory = ""
browserfilter = "All Files (*)" browserfilter = "All files (*)"
fileName, filtr = QtGui.QFileDialog.getOpenFileName(self,"Browse for media files",defaultdirectory, fileName, filtr = QtGui.QFileDialog.getOpenFileName(self,"Browse for media files",defaultdirectory,
browserfilter, "", options) browserfilter, "", options)
if fileName: if fileName:
@ -178,7 +178,7 @@ class MainWindow(QtGui.QMainWindow):
return None return None
def setOffset(self): 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, "Offset (see http://syncplay.pl/guide/ for usage instructions):", QtGui.QLineEdit.Normal,
"") "")
if ok and newoffset != '': if ok and newoffset != '':
@ -290,7 +290,7 @@ class MainWindow(QtGui.QMainWindow):
window.seekGroup.setFixedSize(window.seekGroup.sizeHint()) window.seekGroup.setFixedSize(window.seekGroup.sizeHint())
def addMiscBox(self, window): 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 = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'arrow_undo.png'),"Undo last seek")
window.unseekButton.pressed.connect(self.undoSeek) window.unseekButton.pressed.connect(self.undoSeek)
@ -309,19 +309,19 @@ class MainWindow(QtGui.QMainWindow):
window.menuBar = QtGui.QMenuBar() window.menuBar = QtGui.QMenuBar()
window.fileMenu = QtGui.QMenu("&File", self) 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.openAction.triggered.connect(self.browseMediapath)
window.exitAction = window.fileMenu.addAction(QtGui.QIcon(self.resourcespath + 'cross.png'), "E&xit") window.exitAction = window.fileMenu.addAction(QtGui.QIcon(self.resourcespath + 'cross.png'), "E&xit")
window.exitAction.triggered.connect(self.exitSyncplay) window.exitAction.triggered.connect(self.exitSyncplay)
window.menuBar.addMenu(window.fileMenu) window.menuBar.addMenu(window.fileMenu)
window.advancedMenu = QtGui.QMenu("&Advanced", self) 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.setoffsetAction.triggered.connect(self.setOffset)
window.menuBar.addMenu(window.advancedMenu) window.menuBar.addMenu(window.advancedMenu)
window.helpMenu = QtGui.QMenu("&Help", self) 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.userguideAction.triggered.connect(self.openUserGuide)
window.menuBar.addMenu(window.helpMenu) window.menuBar.addMenu(window.helpMenu)