easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added selector to override the default protocol version.

Browse Source
This commit is contained in:
codestation
2014-10-10 20:42:16 -04:30
parent 0ab3206d18
commit caf5dc2d4e
10 changed files with 235 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,6 +1,7 @@
qcma (0.3.5) unstable; urgency=low qcma (0.3.5) unstable; urgency=low
* Do not override the user provided protocol version. * Added selector to override the default protocol version.
* Do not override the user provided protocol version with a default value.
-- codestation <codestation404@gmail.com> Thu, 09 Oct 2014 00:00:00 -0000 -- codestation <codestation404@gmail.com> Thu, 09 Oct 2014 00:00:00 -0000

94
resources/translations/qcma_es.ts
View File

@@ -158,156 +158,156 @@
<translation>Directorios</translation> <translation>Directorios</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="34"/> <location filename="../../src/forms/configwidget.ui" line="39"/>
<source>Specify the folders that the PS Vita will access for each content type.</source> <source>Specify the folders that the PS Vita will access for each content type.</source>
<translation>Especificar los directorios que el sistema PS Vita accederá para cada tipo de contenido.</translation> <translation>Especificar los directorios que el sistema PS Vita accederá para cada tipo de contenido.</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="46"/> <location filename="../../src/forms/configwidget.ui" line="51"/>
<location filename="../../src/forms/configwidget.ui" line="58"/> <location filename="../../src/forms/configwidget.ui" line="63"/>
<source>This is the location your Screenshots and Pictures are Saved to/Imported from.</source> <source>This is the location your Screenshots and Pictures are Saved to/Imported from.</source>
<translation>Esta es la ubicación donde tus capturas de pantalla e imágenes serán almacenadas o importadas.</translation> <translation>Esta es la ubicación donde tus capturas de pantalla e imágenes serán almacenadas o importadas.</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="49"/> <location filename="../../src/forms/configwidget.ui" line="54"/>
<source>Photo Folder</source> <source>Photo Folder</source>
<translation>Directorio de Fotos</translation> <translation>Directorio de Fotos</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="68"/> <location filename="../../src/forms/configwidget.ui" line="73"/>
<location filename="../../src/forms/configwidget.ui" line="103"/> <location filename="../../src/forms/configwidget.ui" line="108"/>
<location filename="../../src/forms/configwidget.ui" line="138"/> <location filename="../../src/forms/configwidget.ui" line="143"/>
<location filename="../../src/forms/configwidget.ui" line="173"/> <location filename="../../src/forms/configwidget.ui" line="178"/>
<location filename="../../src/forms/configwidget.ui" line="208"/> <location filename="../../src/forms/configwidget.ui" line="213"/>
<location filename="../../src/forms/configwidget.ui" line="233"/> <location filename="../../src/forms/configwidget.ui" line="238"/>
<source>Browse...</source> <source>Browse...</source>
<translation>Buscar...</translation> <translation>Buscar...</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="81"/> <location filename="../../src/forms/configwidget.ui" line="86"/>
<location filename="../../src/forms/configwidget.ui" line="93"/> <location filename="../../src/forms/configwidget.ui" line="98"/>
<source>This is the location your Videos are Saved to/Imported from.</source> <source>This is the location your Videos are Saved to/Imported from.</source>
<translation>Esta es la ubicación donde tus videos serán almacenados o importados.</translation> <translation>Esta es la ubicación donde tus videos serán almacenados o importados.</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="84"/> <location filename="../../src/forms/configwidget.ui" line="89"/>
<source>Video Folder</source> <source>Video Folder</source>
<translation>Directorio de Videos</translation> <translation>Directorio de Videos</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="116"/> <location filename="../../src/forms/configwidget.ui" line="121"/>
<location filename="../../src/forms/configwidget.ui" line="128"/> <location filename="../../src/forms/configwidget.ui" line="133"/>
<source>This is the location your Music is Saved to/Imported from.</source> <source>This is the location your Music is Saved to/Imported from.</source>
<translation>Esta es la ubicación donde tu música será almacenada o importada.</translation> <translation>Esta es la ubicación donde tu música será almacenada o importada.</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="119"/> <location filename="../../src/forms/configwidget.ui" line="124"/>
<source>Music Folder</source> <source>Music Folder</source>
<translation>Directorio de Música</translation> <translation>Directorio de Música</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="151"/> <location filename="../../src/forms/configwidget.ui" line="156"/>
<location filename="../../src/forms/configwidget.ui" line="163"/> <location filename="../../src/forms/configwidget.ui" line="168"/>
<source>This is the location your Games, Apps, Savegames, and System Backups are Saved to/Imported from.</source> <source>This is the location your Games, Apps, Savegames, and System Backups are Saved to/Imported from.</source>
<translation>Esta es la ubicación donde tus juegos, aplicaciones, partidas salvadas y respaldos del sistema serán almacenados o importados.</translation> <translation>Esta es la ubicación donde tus juegos, aplicaciones, partidas salvadas y respaldos del sistema serán almacenados o importados.</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="154"/> <location filename="../../src/forms/configwidget.ui" line="159"/>
<source>Applications / Backups</source> <source>Applications / Backups</source>
<translation>Aplicaciones / Juegos / Respaldos</translation> <translation>Aplicaciones / Juegos / Respaldos</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="186"/> <location filename="../../src/forms/configwidget.ui" line="191"/>
<source>This is the location your Software Updates and Browser Data is Saved to/Imported from.</source> <source>This is the location your Software Updates and Browser Data is Saved to/Imported from.</source>
<translation>Esta es la ubicación donde el sistema PS Vita leerá los contenidos que intente descargar.</translation> <translation>Esta es la ubicación donde el sistema PS Vita leerá los contenidos que intente descargar.</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="189"/> <location filename="../../src/forms/configwidget.ui" line="194"/>
<source>Updates / Web content</source> <source>Updates / Web content</source>
<translation>Actualizaciones / Contenido Web</translation> <translation>Actualizaciones / Contenido Web</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="198"/> <location filename="../../src/forms/configwidget.ui" line="203"/>
<source>This is the location your PS Vita system will read all the content that it tries to download.</source> <source>This is the location your PS Vita system will read all the content that it tries to download.</source>
<translation>Esta es la ubicación donde el sistema PS Vita leerá los contenidos que intente descargar.</translation> <translation>Esta es la ubicación donde el sistema PS Vita leerá los contenidos que intente descargar.</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="221"/> <location filename="../../src/forms/configwidget.ui" line="226"/>
<source>Packages</source> <source>Packages</source>
<translation>Archivos PKG</translation> <translation>Archivos PKG</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="247"/> <location filename="../../src/forms/configwidget.ui" line="265"/>
<source>Other</source> <source>Other</source>
<translation>Otros</translation> <translation>Otros</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="255"/> <location filename="../../src/forms/configwidget.ui" line="273"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Advanced settings&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Advanced settings&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Ajustes Avanzados&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Ajustes Avanzados&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="262"/> <location filename="../../src/forms/configwidget.ui" line="280"/>
<source>Offline Mode</source> <source>Offline Mode</source>
<translation>Modo desconectado</translation> <translation>Modo desconectado</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="272"/> <location filename="../../src/forms/configwidget.ui" line="290"/>
<source>Skip metadata extraction</source> <source>Skip metadata extraction</source>
<translation>Saltar la extracción de metadatos</translation> <translation>Saltar la extracción de metadatos</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="296"/> <location filename="../../src/forms/configwidget.ui" line="314"/>
<source>Update database automatically when files on the PC are changed</source> <source>Update database automatically when files on the PC are changed</source>
<translation>Actualizar la base de datos automaticamente</translation> <translation>Actualizar la base de datos automaticamente</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="324"/> <location filename="../../src/forms/configwidget.ui" line="342"/>
<source>SQLite</source> <source>SQLite</source>
<translation>SQLite</translation> <translation>SQLite</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="334"/> <location filename="../../src/forms/configwidget.ui" line="352"/>
<source>Skip photo scanning</source> <source>Skip photo scanning</source>
<translation>Omitir el escaneo de fotos</translation> <translation>Omitir el escaneo de fotos</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="341"/> <location filename="../../src/forms/configwidget.ui" line="359"/>
<source>Skip video scanning</source> <source>Skip video scanning</source>
<translation>Omitir el escaneo de vídeos</translation> <translation>Omitir el escaneo de vídeos</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="348"/> <location filename="../../src/forms/configwidget.ui" line="366"/>
<source>Skip music scanning</source> <source>Skip music scanning</source>
<translation>Omitir el escaneo de música</translation> <translation>Omitir el escaneo de música</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="357"/> <location filename="../../src/forms/configwidget.ui" line="381"/>
<source>CMA Protocol version</source> <source>CMA Protocol version</source>
<translation>Versión del protocolo CMA</translation> <translation>Versión del protocolo CMA</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="371"/> <location filename="../../src/forms/configwidget.ui" line="436"/>
<source>Reset to default</source> <source>Use custom version</source>
<translation>Valor por defecto</translation> <translation>Usar versión personalizada</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="279"/> <location filename="../../src/forms/configwidget.ui" line="297"/>
<source>Disable USB monitoring</source> <source>Disable USB monitoring</source>
<translation>Deshabilitar monitoreo USB</translation> <translation>Deshabilitar monitoreo USB</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="286"/> <location filename="../../src/forms/configwidget.ui" line="304"/>
<source>Disable Wi-Fi monitoring</source> <source>Disable Wi-Fi monitoring</source>
<translation>Deshabilitar monitoreo WiFi</translation> <translation>Deshabilitar monitoreo WiFi</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="308"/> <location filename="../../src/forms/configwidget.ui" line="326"/>
<source>Database backend</source> <source>Database backend</source>
<translation>Almacenaje de base de datos</translation> <translation>Almacenaje de base de datos</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="319"/> <location filename="../../src/forms/configwidget.ui" line="337"/>
<source>In Memory</source> <source>In Memory</source>
<translation>En memoria</translation> <translation>En memoria</translation>
</message> </message>
@@ -460,7 +460,7 @@ Hash de compilación: %1
Rama de compilación: %2</translation> Rama de compilación: %2</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="281"/> <location filename="../../src/gui/mainwidget.cpp" line="283"/>
<source>Information</source> <source>Information</source>
<translation>Información</translation> <translation>Información</translation>
</message> </message>
@@ -601,32 +601,32 @@ Rama de compilación: %2</translation>
<context> <context>
<name>UnityIndicator</name> <name>UnityIndicator</name>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="104"/> <location filename="../../src/indicator/unityindicator.cpp" line="105"/>
<source>Settings</source> <source>Settings</source>
<translation>Ajustes</translation> <translation>Ajustes</translation>
</message> </message>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="105"/> <location filename="../../src/indicator/unityindicator.cpp" line="106"/>
<source>Refresh database</source> <source>Refresh database</source>
<translation>Refrescar base de datos</translation> <translation>Refrescar base de datos</translation>
</message> </message>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="106"/> <location filename="../../src/indicator/unityindicator.cpp" line="107"/>
<source>Backup Manager</source> <source>Backup Manager</source>
<translation>Gestor de Respaldos</translation> <translation>Gestor de Respaldos</translation>
</message> </message>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="108"/> <location filename="../../src/indicator/unityindicator.cpp" line="109"/>
<source>About QCMA</source> <source>About QCMA</source>
<translation>Acerca de QCMA</translation> <translation>Acerca de QCMA</translation>
</message> </message>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="109"/> <location filename="../../src/indicator/unityindicator.cpp" line="110"/>
<source>About Qt</source> <source>About Qt</source>
<translation>Acerca de Qt</translation> <translation>Acerca de Qt</translation>
</message> </message>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="111"/> <location filename="../../src/indicator/unityindicator.cpp" line="112"/>
<source>Quit</source> <source>Quit</source>
<translation>Salir</translation> <translation>Salir</translation>
</message> </message>

94
resources/translations/qcma_ja.ts
View File

@@ -158,156 +158,156 @@
<translation>フォルダ</translation> <translation>フォルダ</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="34"/> <location filename="../../src/forms/configwidget.ui" line="39"/>
<source>Specify the folders that the PS Vita will access for each content type.</source> <source>Specify the folders that the PS Vita will access for each content type.</source>
<translation>PS Vitaがアクセスするフォルダーをコンテンツの種類ごとに指定してください。</translation> <translation>PS Vitaがアクセスするフォルダーをコンテンツの種類ごとに指定してください。</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="46"/> <location filename="../../src/forms/configwidget.ui" line="51"/>
<location filename="../../src/forms/configwidget.ui" line="58"/> <location filename="../../src/forms/configwidget.ui" line="63"/>
<source>This is the location your Screenshots and Pictures are Saved to/Imported from.</source> <source>This is the location your Screenshots and Pictures are Saved to/Imported from.</source>
<translation>スクリーンショットや画像を保存/インポートする場所です。</translation> <translation>スクリーンショットや画像を保存/インポートする場所です。</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="49"/> <location filename="../../src/forms/configwidget.ui" line="54"/>
<source>Photo Folder</source> <source>Photo Folder</source>
<translation>フォト</translation> <translation>フォト</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="68"/> <location filename="../../src/forms/configwidget.ui" line="73"/>
<location filename="../../src/forms/configwidget.ui" line="103"/> <location filename="../../src/forms/configwidget.ui" line="108"/>
<location filename="../../src/forms/configwidget.ui" line="138"/> <location filename="../../src/forms/configwidget.ui" line="143"/>
<location filename="../../src/forms/configwidget.ui" line="173"/> <location filename="../../src/forms/configwidget.ui" line="178"/>
<location filename="../../src/forms/configwidget.ui" line="208"/> <location filename="../../src/forms/configwidget.ui" line="213"/>
<location filename="../../src/forms/configwidget.ui" line="233"/> <location filename="../../src/forms/configwidget.ui" line="238"/>
<source>Browse...</source> <source>Browse...</source>
<translation>参照...</translation> <translation>参照...</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="81"/> <location filename="../../src/forms/configwidget.ui" line="86"/>
<location filename="../../src/forms/configwidget.ui" line="93"/> <location filename="../../src/forms/configwidget.ui" line="98"/>
<source>This is the location your Videos are Saved to/Imported from.</source> <source>This is the location your Videos are Saved to/Imported from.</source>
<translation>ビデオを保存/インポートする場所です。</translation> <translation>ビデオを保存/インポートする場所です。</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="84"/> <location filename="../../src/forms/configwidget.ui" line="89"/>
<source>Video Folder</source> <source>Video Folder</source>
<translation>ビデオ</translation> <translation>ビデオ</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="116"/> <location filename="../../src/forms/configwidget.ui" line="121"/>
<location filename="../../src/forms/configwidget.ui" line="128"/> <location filename="../../src/forms/configwidget.ui" line="133"/>
<source>This is the location your Music is Saved to/Imported from.</source> <source>This is the location your Music is Saved to/Imported from.</source>
<translation>ミュージックを保存/インポートする場所です。</translation> <translation>ミュージックを保存/インポートする場所です。</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="119"/> <location filename="../../src/forms/configwidget.ui" line="124"/>
<source>Music Folder</source> <source>Music Folder</source>
<translation>ミュージック</translation> <translation>ミュージック</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="151"/> <location filename="../../src/forms/configwidget.ui" line="156"/>
<location filename="../../src/forms/configwidget.ui" line="163"/> <location filename="../../src/forms/configwidget.ui" line="168"/>
<source>This is the location your Games, Apps, Savegames, and System Backups are Saved to/Imported from.</source> <source>This is the location your Games, Apps, Savegames, and System Backups are Saved to/Imported from.</source>
<translation>ゲームやアプリ、セーブデータ、システムバックアップを保存/インポートする場所です。</translation> <translation>ゲームやアプリ、セーブデータ、システムバックアップを保存/インポートする場所です。</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="154"/> <location filename="../../src/forms/configwidget.ui" line="159"/>
<source>Applications / Backups</source> <source>Applications / Backups</source>
<translation>アプリケーション/バックアップファイル</translation> <translation>アプリケーション/バックアップファイル</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="186"/> <location filename="../../src/forms/configwidget.ui" line="191"/>
<source>This is the location your Software Updates and Browser Data is Saved to/Imported from.</source> <source>This is the location your Software Updates and Browser Data is Saved to/Imported from.</source>
<translation>ソフトウェアアップデートとブラウザデータをを保存/インポートする場所です。</translation> <translation>ソフトウェアアップデートとブラウザデータをを保存/インポートする場所です。</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="189"/> <location filename="../../src/forms/configwidget.ui" line="194"/>
<source>Updates / Web content</source> <source>Updates / Web content</source>
<translation>アップデート/Webコンテンツ</translation> <translation>アップデート/Webコンテンツ</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="198"/> <location filename="../../src/forms/configwidget.ui" line="203"/>
<source>This is the location your PS Vita system will read all the content that it tries to download.</source> <source>This is the location your PS Vita system will read all the content that it tries to download.</source>
<translation>この場所の全てのコンテンツをPS Vitaシステムが読み込み、ダウンロードを試みます。</translation> <translation>この場所の全てのコンテンツをPS Vitaシステムが読み込み、ダウンロードを試みます。</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="221"/> <location filename="../../src/forms/configwidget.ui" line="226"/>
<source>Packages</source> <source>Packages</source>
<translation>パッケージ</translation> <translation>パッケージ</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="247"/> <location filename="../../src/forms/configwidget.ui" line="265"/>
<source>Other</source> <source>Other</source>
<translation>その他</translation> <translation>その他</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="255"/> <location filename="../../src/forms/configwidget.ui" line="273"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Advanced settings&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;Advanced settings&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;詳細設定&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;詳細設定&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="262"/> <location filename="../../src/forms/configwidget.ui" line="280"/>
<source>Offline Mode</source> <source>Offline Mode</source>
<translation>オフラインモード</translation> <translation>オフラインモード</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="272"/> <location filename="../../src/forms/configwidget.ui" line="290"/>
<source>Skip metadata extraction</source> <source>Skip metadata extraction</source>
<translation>メタデータの展開をスキップする</translation> <translation>メタデータの展開をスキップする</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="296"/> <location filename="../../src/forms/configwidget.ui" line="314"/>
<source>Update database automatically when files on the PC are changed</source> <source>Update database automatically when files on the PC are changed</source>
<translation>PCのファイルが変更された際にデータベースを自動的に更新する</translation> <translation>PCのファイルが変更された際にデータベースを自動的に更新する</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="324"/> <location filename="../../src/forms/configwidget.ui" line="342"/>
<source>SQLite</source> <source>SQLite</source>
<translation>SQLite</translation> <translation>SQLite</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="334"/> <location filename="../../src/forms/configwidget.ui" line="352"/>
<source>Skip photo scanning</source> <source>Skip photo scanning</source>
<translation>フォトのスキャンをスキップする</translation> <translation>フォトのスキャンをスキップする</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="341"/> <location filename="../../src/forms/configwidget.ui" line="359"/>
<source>Skip video scanning</source> <source>Skip video scanning</source>
<translation>ビデオのスキャンをスキップする</translation> <translation>ビデオのスキャンをスキップする</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="348"/> <location filename="../../src/forms/configwidget.ui" line="366"/>
<source>Skip music scanning</source> <source>Skip music scanning</source>
<translation>ミュージックのスキャンをスキップする</translation> <translation>ミュージックのスキャンをスキップする</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="357"/> <location filename="../../src/forms/configwidget.ui" line="381"/>
<source>CMA Protocol version</source> <source>CMA Protocol version</source>
<translation>CMAプロトコルバージョン</translation> <translation>CMAプロトコルバージョン</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="371"/> <location filename="../../src/forms/configwidget.ui" line="436"/>
<source>Reset to default</source> <source>Use custom version</source>
<translation>既定値にリセット</translation> <translation>カスタムバージョンを使用</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="279"/> <location filename="../../src/forms/configwidget.ui" line="297"/>
<source>Disable USB monitoring</source> <source>Disable USB monitoring</source>
<translation>USBの監視を無効にする</translation> <translation>USBの監視を無効にする</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="286"/> <location filename="../../src/forms/configwidget.ui" line="304"/>
<source>Disable Wi-Fi monitoring</source> <source>Disable Wi-Fi monitoring</source>
<translation>Wi-Fiの監視を無効にする</translation> <translation>Wi-Fiの監視を無効にする</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="308"/> <location filename="../../src/forms/configwidget.ui" line="326"/>
<source>Database backend</source> <source>Database backend</source>
<translation>データベース保存</translation> <translation>データベース保存</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="319"/> <location filename="../../src/forms/configwidget.ui" line="337"/>
<source>In Memory</source> <source>In Memory</source>
<translation>メモリ内</translation> <translation>メモリ内</translation>
</message> </message>
@@ -461,7 +461,7 @@ build branch: %2</source>
ビルドブランチ: %2</translation> ビルドブランチ: %2</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="281"/> <location filename="../../src/gui/mainwidget.cpp" line="283"/>
<source>Information</source> <source>Information</source>
<translation>情報</translation> <translation>情報</translation>
</message> </message>
@@ -602,32 +602,32 @@ build branch: %2</source>
<context> <context>
<name>UnityIndicator</name> <name>UnityIndicator</name>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="104"/> <location filename="../../src/indicator/unityindicator.cpp" line="105"/>
<source>Settings</source> <source>Settings</source>
<translation>設定</translation> <translation>設定</translation>
</message> </message>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="105"/> <location filename="../../src/indicator/unityindicator.cpp" line="106"/>
<source>Refresh database</source> <source>Refresh database</source>
<translation>データベースを更新する</translation> <translation>データベースを更新する</translation>
</message> </message>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="106"/> <location filename="../../src/indicator/unityindicator.cpp" line="107"/>
<source>Backup Manager</source> <source>Backup Manager</source>
<translation>バックアップマネージャー</translation> <translation>バックアップマネージャー</translation>
</message> </message>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="108"/> <location filename="../../src/indicator/unityindicator.cpp" line="109"/>
<source>About QCMA</source> <source>About QCMA</source>
<translation>QCMAについて</translation> <translation>QCMAについて</translation>
</message> </message>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="109"/> <location filename="../../src/indicator/unityindicator.cpp" line="110"/>
<source>About Qt</source> <source>About Qt</source>
<translation>Qtについて</translation> <translation>Qtについて</translation>
</message> </message>
<message> <message>
<location filename="../../src/indicator/unityindicator.cpp" line="111"/> <location filename="../../src/indicator/unityindicator.cpp" line="112"/>
<source>Quit</source> <source>Quit</source>
<translation>終了</translation> <translation>終了</translation>
</message> </message>

2
src/capability.cpp
View File

@@ -41,7 +41,7 @@ bool DeviceCapability::exchangeInfo(vita_device_t *device)
} }
QString hostname = QHostInfo::localHostName(); QString hostname = QHostInfo::localHostName();
int protocol_version = QSettings().value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt(); int protocol_version = getProtocolVersion();
const initiator_info_t *pc_info = VitaMTP_Data_Initiator_New(hostname.toUtf8().data(), protocol_version); const initiator_info_t *pc_info = VitaMTP_Data_Initiator_New(hostname.toUtf8().data(), protocol_version);
// Next, we send the client's (this program) info (discard the const here) // Next, we send the client's (this program) info (discard the const here)

3
src/cmabroadcast.cpp
View File

@@ -18,6 +18,7 @@
*/ */
#include "cmabroadcast.h" #include "cmabroadcast.h"
#include "cmautils.h"
#include <QDebug> #include <QDebug>
#include <QHostInfo> #include <QHostInfo>
@@ -85,7 +86,7 @@ void CmaBroadcast::readPendingDatagrams()
void CmaBroadcast::setAvailable() void CmaBroadcast::setAvailable()
{ {
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
int protocol_version = QSettings().value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt(); int protocol_version = getProtocolVersion();
reply.clear(); reply.clear();
reply.insert(0, broadcast_reply reply.insert(0, broadcast_reply

49
src/cmautils.cpp
View File

@@ -24,6 +24,7 @@
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QImage> #include <QImage>
#include <QSettings>
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
#include <windows.h> #include <windows.h>
@@ -184,3 +185,51 @@ QString readable_size(qint64 size, bool use_gib)
} }
return QString().setNum(size_f,'f',2) + " " + unit; return QString().setNum(size_f,'f',2) + " " + unit;
} }
int getProtocolVersion()
{
bool useCustom = QSettings().value("useCustomProtocol").toBool();
if(useCustom)
{
bool ok;
int protocol = QSettings().value("protocolVersion").toInt(&ok);
if(ok && protocol > 0)
return protocol;
else
return VITAMTP_PROTOCOL_MAX_VERSION;
}
else
{
int protocol;
int index = QSettings().value("protocolIndex").toInt();
switch(index)
{
case 0:
protocol = VITAMTP_PROTOCOL_FW_3_30;
break;
case 1:
protocol = VITAMTP_PROTOCOL_FW_3_10;
break;
case 2:
protocol = VITAMTP_PROTOCOL_FW_3_00;
break;
case 3:
protocol = VITAMTP_PROTOCOL_FW_2_60;
break;
case 4:
protocol = VITAMTP_PROTOCOL_FW_2_10;
break;
case 5:
protocol = VITAMTP_PROTOCOL_FW_2_00;
break;
case 6:
protocol = VITAMTP_WIRELESS_FW_2_00;
break;
default:
protocol = VITAMTP_PROTOCOL_MAX_VERSION;
break;
}
return protocol;
}
}

1
src/cmautils.h
View File

@@ -49,5 +49,6 @@ bool removeRecursively(const QString &path);
QString readable_size(qint64 size, bool use_gib = false); QString readable_size(qint64 size, bool use_gib = false);
bool getDiskSpace(const QString &dir, quint64 *free, quint64 *total); bool getDiskSpace(const QString &dir, quint64 *free, quint64 *total);
QByteArray getThumbnail(const QString &path, DataType type, metadata_t *metadata); QByteArray getThumbnail(const QString &path, DataType type, metadata_t *metadata);
int getProtocolVersion();
#endif // UTILS_H #endif // UTILS_H

30
src/forms/configwidget.cpp
View File

@@ -62,7 +62,6 @@ void ConfigWidget::connectSignals()
connect(mapper, SIGNAL(mapped(int)), this, SLOT(browseBtnPressed(int))); connect(mapper, SIGNAL(mapped(int)), this, SLOT(browseBtnPressed(int)));
connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject())); connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(ui->resetProtocolButton, SIGNAL(clicked()), this, SLOT(resetButtonPressed()));
} }
void ConfigWidget::setDefaultData() void ConfigWidget::setDefaultData()
@@ -100,8 +99,16 @@ void ConfigWidget::setDefaultData()
ui->videoSkipCheck->setChecked(settings.value("videoSkip", false).toBool()); ui->videoSkipCheck->setChecked(settings.value("videoSkip", false).toBool());
ui->musicSkipCheck->setChecked(settings.value("musicSkip", false).toBool()); ui->musicSkipCheck->setChecked(settings.value("musicSkip", false).toBool());
int protocol_version = settings.value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt(); ui->customProtocolCheckBox->setChecked(settings.value("useCustomProtocol", false).toBool());
ui->protocolEdit->setText(QString::number(protocol_version)); ui->protocolBox->setCurrentIndex(settings.value("protocolIndex", 0).toInt());
bool ok;
int protocol_version = settings.value("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION).toInt(&ok);
if(ok && protocol_version > 0)
ui->protocolEdit->setText(QString::number(protocol_version));
else
ui->protocolEdit->setText(QString::number(VITAMTP_PROTOCOL_MAX_VERSION));
} }
ConfigWidget::~ConfigWidget() ConfigWidget::~ConfigWidget()
@@ -109,11 +116,6 @@ ConfigWidget::~ConfigWidget()
delete ui; delete ui;
} }
void ConfigWidget::resetButtonPressed()
{
ui->protocolEdit->setText(QString::number(VITAMTP_PROTOCOL_MAX_VERSION));
}
void ConfigWidget::browseBtnPressed(int btn) void ConfigWidget::browseBtnPressed(int btn)
{ {
QString msg; QString msg;
@@ -188,7 +190,17 @@ void ConfigWidget::accept()
settings.setValue("photoSkip", ui->photoSkipCheck->isChecked()); settings.setValue("photoSkip", ui->photoSkipCheck->isChecked());
settings.setValue("videoSkip", ui->videoSkipCheck->isChecked()); settings.setValue("videoSkip", ui->videoSkipCheck->isChecked());
settings.setValue("musicSkip", ui->musicSkipCheck->isChecked()); settings.setValue("musicSkip", ui->musicSkipCheck->isChecked());
settings.setValue("protocolVersion", ui->protocolEdit->text().toInt()); settings.setValue("useCustomProtocol", ui->customProtocolCheckBox->isChecked());
settings.setValue("protocolIndex", ui->protocolBox->currentIndex());
bool ok;
int protocol = ui->protocolEdit->text().toInt(&ok);
if(ok && protocol > 0)
settings.setValue("protocolVersion", protocol);
else
settings.setValue("protocolVersion", VITAMTP_PROTOCOL_MAX_VERSION);
settings.sync(); settings.sync();
done(Accepted); done(Accepted);

1
src/forms/configwidget.h
View File

@@ -48,7 +48,6 @@ private:
private slots: private slots:
void browseBtnPressed(int from); void browseBtnPressed(int from);
void resetButtonPressed();
void accept(); void accept();
}; };

73
src/forms/configwidget.ui
View File

@@ -368,25 +368,82 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_4"/>
<item> </item>
<item>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>CMA Protocol version</string> <string>CMA Protocol version</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QComboBox" name="protocolBox">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string notr="true">FW 3.30 - 1900010</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">FW 3.10 - 1800010</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">FW 3.00 - 1700010</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">FW 2.60 - 1600010</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">FW 2.10 - 1500010</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">FW 2.00 - 1400010</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">FW 1.00 - 1000000</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="customProtocolCheckBox">
<property name="text">
<string>Use custom version</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="protocolEdit"> <widget class="QLineEdit" name="protocolEdit">
<property name="inputMask"> <property name="inputMask">
<string notr="true">9999999</string> <string notr="true">9999999</string>
</property> </property>
</widget>
</item>
<item>
<widget class="QPushButton" name="resetProtocolButton">
<property name="text"> <property name="text">
<string>Reset to default</string> <string notr="true"/>
</property> </property>
</widget> </widget>
</item> </item>