Skip to content

Commit c6f88a0

Browse files
kamnxtkamnxt
committed
Merge remote-tracking branch 'upstream/master'
2 parents 9197722 + 2e5a715 commit c6f88a0

File tree

7 files changed

+172
-64
lines changed

7 files changed

+172
-64
lines changed

‎FusionLang_de.qm‎

40 Bytes
Binary file not shown.

‎FusionLang_de.ts‎

Lines changed: 62 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</message>
2626
<message>
2727
<location filename="addgamedialog.ui" line="94"/>
28-
<location filename="addgamedialog.cpp" line="48"/>
28+
<location filename="addgamedialog.cpp" line="49"/>
2929
<source>Choose executable</source>
3030
<translation>Wähle Exe</translation>
3131
</message>
@@ -55,12 +55,34 @@
5555
<translation>Benutze Launcher</translation>
5656
</message>
5757
<message>
58-
<location filename="addgamedialog.cpp" line="39"/>
58+
<location filename="addgamedialog.cpp" line="40"/>
5959
<source>Choose the game directory</source>
6060
<translation>Wähle Spiel-Verzeichnis</translation>
6161
</message>
6262
<message>
63-
<location filename="addgamedialog.cpp" line="87"/>
63+
<location filename="addgamedialog.cpp" line="62"/>
64+
<location filename="addgamedialog.cpp" line="67"/>
65+
<location filename="addgamedialog.cpp" line="72"/>
66+
<source>Please fill all fields!</source>
67+
<translation>Bitte alle Felder ausfüllen!</translation>
68+
</message>
69+
<message>
70+
<location filename="addgamedialog.cpp" line="62"/>
71+
<source>You have to fill the name-field!</source>
72+
<translation>Ein Name muss angegeben werden!</translation>
73+
</message>
74+
<message>
75+
<location filename="addgamedialog.cpp" line="67"/>
76+
<source>You have to set an executable!</source>
77+
<translation>Eine ausführbare Datei muss angegeben werden!</translation>
78+
</message>
79+
<message>
80+
<location filename="addgamedialog.cpp" line="72"/>
81+
<source>You have to set a path!</source>
82+
<translation>Ein Pfad muss angegeben werden!</translation>
83+
</message>
84+
<message>
85+
<location filename="addgamedialog.cpp" line="98"/>
6486
<source>Choose command</source>
6587
<translation>Wähle Befehl</translation>
6688
</message>
@@ -137,7 +159,7 @@
137159
</message>
138160
<message>
139161
<location filename="fsettingsdialog.ui" line="276"/>
140-
<location filename="fsettingsdialog.ui" line="566"/>
162+
<location filename="fsettingsdialog.ui" line="600"/>
141163
<source>...</source>
142164
<translation>...</translation>
143165
</message>
@@ -203,7 +225,17 @@
203225
<translation>...</translation>
204226
</message>
205227
<message>
206-
<location filename="fsettingsdialog.ui" line="583"/>
228+
<location filename="fsettingsdialog.ui" line="563"/>
229+
<source>Delete Logfiles</source>
230+
<translation>Lösche Logfiles</translation>
231+
</message>
232+
<message>
233+
<location filename="fsettingsdialog.ui" line="570"/>
234+
<source>Open Folder</source>
235+
<translation>Öffne Log-Ordner</translation>
236+
</message>
237+
<message>
238+
<location filename="fsettingsdialog.ui" line="617"/>
207239
<source>To enable Syncing, select the Savegame-Folder in the Settings Dialog in each game, and a synced Directory here - for Example an Dropbox or OwnCloud folder.
208240

209241
Fusion will then keep these Directorys up to date by overriding the old data.
@@ -245,13 +277,13 @@ $GAMEPATH Pfad zum Spiel
245277
$GAMEEXE Name des Ausführbaren Datei, relativ zu $GAMEPATH</translation>
246278
</message>
247279
<message>
248-
<location filename="fsettingsdialog.ui" line="573"/>
280+
<location filename="fsettingsdialog.ui" line="607"/>
249281
<source>Local saved Backups:</source>
250282
<translation>Anzahl Backups:</translation>
251283
</message>
252284
<message>
253-
<location filename="fsettingsdialog.ui" line="553"/>
254-
<location filename="fsettingsdialog.cpp" line="220"/>
285+
<location filename="fsettingsdialog.ui" line="587"/>
286+
<location filename="fsettingsdialog.cpp" line="267"/>
255287
<source>Target-Dir</source>
256288
<translation>Ziel-Verzeichnis</translation>
257289
</message>
@@ -286,106 +318,82 @@ $GAMEEXE Name des Ausführbaren Datei, relativ zu $GAMEPATH</translation>
286318
<translation>Launcher</translation>
287319
</message>
288320
<message>
289-
<location filename="fsettingsdialog.cpp" line="36"/>
290-
<source>English</source>
291-
<translation type="unfinished"></translation>
292-
</message>
293-
<message>
294-
<location filename="fsettingsdialog.cpp" line="37"/>
295-
<source>German (Deutsch)</source>
296-
<oldsource>German</oldsource>
297-
<translation type="unfinished"></translation>
321+
<location filename="fsettingsdialog.cpp" line="24"/>
322+
<source>Logfiles</source>
323+
<translation>Logfiles</translation>
298324
</message>
299325
<message>
300-
<location filename="fsettingsdialog.cpp" line="38"/>
301-
<source>Norwegian (Norsk)</source>
302-
<oldsource>Norwegian</oldsource>
303-
<translation type="unfinished"></translation>
304-
</message>
305-
<message>
306-
<location filename="fsettingsdialog.cpp" line="39"/>
307-
<source>Polish (Polski)</source>
308-
<oldsource>Polish</oldsource>
309-
<translation type="unfinished"></translation>
310-
</message>
311-
<message>
312-
<location filename="fsettingsdialog.cpp" line="40"/>
313-
<source>Spanish (Español)</source>
314-
<oldsource>Spanish</oldsource>
315-
<translation type="unfinished"></translation>
316-
</message>
317-
<message>
318-
<location filename="fsettingsdialog.cpp" line="105"/>
326+
<location filename="fsettingsdialog.cpp" line="152"/>
319327
<source>Choose stylesheet</source>
320328
<translation>Wähle Stylesheet</translation>
321329
</message>
322330
<message>
323-
<location filename="fsettingsdialog.cpp" line="158"/>
324-
<location filename="fsettingsdialog.cpp" line="163"/>
325-
<location filename="fsettingsdialog.cpp" line="173"/>
331+
<location filename="fsettingsdialog.cpp" line="205"/>
332+
<location filename="fsettingsdialog.cpp" line="210"/>
333+
<location filename="fsettingsdialog.cpp" line="220"/>
326334
<source>Error</source>
327335
<translation>Fehler</translation>
328336
</message>
329337
<message>
330-
<location filename="fsettingsdialog.cpp" line="158"/>
338+
<location filename="fsettingsdialog.cpp" line="205"/>
331339
<source>Please set a name.</source>
332340
<translation>Bitte Namen angeben.</translation>
333341
</message>
334342
<message>
335-
<location filename="fsettingsdialog.cpp" line="163"/>
343+
<location filename="fsettingsdialog.cpp" line="210"/>
336344
<source>Please set a path.</source>
337345
<translation>Bitte Pfad angeben</translation>
338346
</message>
339347
<message>
340-
<location filename="fsettingsdialog.cpp" line="173"/>
348+
<location filename="fsettingsdialog.cpp" line="220"/>
341349
<source>This name already exists!</source>
342350
<translation>Dieser Name existiert bereits!</translation>
343351
</message>
344352
<message>
345-
<location filename="fsettingsdialog.cpp" line="194"/>
353+
<location filename="fsettingsdialog.cpp" line="241"/>
346354
<source>Choose launcher</source>
347355
<translation>Wähle Launcher</translation>
348356
</message>
349357
<message>
350-
<location filename="fsettingsdialog.cpp" line="241"/>
351-
<location filename="fsettingsdialog.cpp" line="275"/>
358+
<location filename="fsettingsdialog.cpp" line="288"/>
359+
<location filename="fsettingsdialog.cpp" line="322"/>
352360
<source>Please confirm!</source>
353361
<translation>Bitte bestätigen!</translation>
354362
</message>
355363
<message>
356-
<location filename="fsettingsdialog.cpp" line="241"/>
364+
<location filename="fsettingsdialog.cpp" line="288"/>
357365
<source>If artwork is found, existing artwork will be overwritten!</source>
358366
<translation>Wird Artwork gefunden, werden vorhandene Grafiken ersetzt!</translation>
359367
</message>
360368
<message>
361-
<location filename="fsettingsdialog.cpp" line="261"/>
369+
<location filename="fsettingsdialog.cpp" line="308"/>
362370
<source>Choose the library folder</source>
363371
<translation>Wähle einen Ordner</translation>
364372
</message>
365373
<message>
366-
<location filename="fsettingsdialog.cpp" line="275"/>
374+
<location filename="fsettingsdialog.cpp" line="322"/>
367375
<source>Do you really want to remove</source>
368376
<translation>Willst du folgenden Pfad wirklich entfernen?
369377
</translation>
370378
</message>
371379
<message>
372-
<location filename="fsettingsdialog.cpp" line="275"/>
380+
<location filename="fsettingsdialog.cpp" line="322"/>
373381
<source>The games inside won&apos;t be removed from your disk.</source>
374382
<translation>Die Spiele im Ordner werden nicht entfernt</translation>
375383
</message>
376384
<message>
377-
<location filename="fsettingsdialog.cpp" line="295"/>
378-
<location filename="fsettingsdialog.cpp" line="303"/>
385+
<location filename="fsettingsdialog.cpp" line="342"/>
386+
<location filename="fsettingsdialog.cpp" line="350"/>
379387
<source>Running downloads:</source>
380388
<translation>Laufende Downloads:</translation>
381389
</message>
382390
<message>
383-
<location filename="fsettingsdialog.cpp" line="297"/>
391+
<location filename="fsettingsdialog.cpp" line="344"/>
384392
<source>Downloads finished</source>
385393
<translation>Downloads beendet</translation>
386394
</message>
387395
<message numerus="yes">
388-
<location filename="fsettingsdialog.cpp" line="297"/>
396+
<location filename="fsettingsdialog.cpp" line="344"/>
389397
<source>Finished %n download(s)</source>
390398
<translation>
391399
<numerusform>%n Download beendet</numerusform>
@@ -572,18 +580,13 @@ Game</source>
572580
<message>
573581
<location filename="mainwindow.ui" line="232"/>
574582
<source>LIBRARY</source>
575-
<translation>LIBRARY</translation>
583+
<translation>BIBLIOTHEK</translation>
576584
</message>
577585
<message>
578586
<location filename="mainwindow.ui" line="400"/>
579587
<source>No games in List.</source>
580588
<translation>Keine Spiele gefunden.</translation>
581589
</message>
582-
<message>
583-
<location filename="mainwindow.ui" line="447"/>
584-
<source>lbl_lastPlayed</source>
585-
<translation></translation>
586-
</message>
587590
<message>
588591
<location filename="mainwindow.ui" line="728"/>
589592
<source>COMMUNITY</source>

‎addgamedialog.cpp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "ui_addgamedialog.h"
33
#include "fgame.h"
44
#include <QFileDialog>
5+
#include <QMessageBox>
56
#include "fdb.h"
67
#include "flauncher.h"
78

@@ -62,6 +63,22 @@ void AddGameDialog::on_buttonBox_accepted()
6263
return;
6364
}
6465
game.setName(ui->gameNameEdit->text());
66+
67+
if(game.getName().length() <= 0) {
68+
QMessageBox::warning(this, tr("Please fill all fields!"), tr("You have to fill the name-field!"), QMessageBox::Ok);
69+
return;
70+
}
71+
72+
if(game.getExe().length() <= 0) {
73+
QMessageBox::warning(this, tr("Please fill all fields!"), tr("You have to set an executable!"), QMessageBox::Ok);
74+
return;
75+
}
76+
77+
if(game.getPath().length() <= 0) {
78+
QMessageBox::warning(this, tr("Please fill all fields!"), tr("You have to set a path!"), QMessageBox::Ok);
79+
return;
80+
}
81+
6582
game.setCommand(ui->gameCommandEdit->text());
6683
game.setArgs(QStringList(ui->gameArgsEdit->text()));
6784
game.setType(Executable);

‎fsettingsdialog.cpp‎

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FSettingsDialog::FSettingsDialog(FDB *db, QWidget *parent) :
2121
ui->listWidget->addItem(tr("Artwork"));
2222
ui->listWidget->addItem(tr("Watched Folders"));
2323
ui->listWidget->addItem(tr("Launchers"));
24+
ui->listWidget->addItem(tr("Logfiles"));
2425
// ui->listWidget->addItem(tr("Savegame-Sync"));
2526
ui->listWidget->setCurrentRow(0);
2627

@@ -42,7 +43,7 @@ FSettingsDialog::FSettingsDialog(FDB *db, QWidget *parent) :
4243
ui->cb_int_language->setCurrentIndex(idx);
4344
#endif
4445

45-
//##########################
46+
//=================================
4647
//WatchedFolders
4748
QList<FWatchedFolder> tmpList = db->getWatchedFoldersList();
4849
ui->lw_Folder_FolderList->clear();
@@ -52,13 +53,13 @@ FSettingsDialog::FSettingsDialog(FDB *db, QWidget *parent) :
5253
ui->lw_Folder_FolderList->addItem(tmpList[i].getDirectory().absolutePath());
5354
}
5455

55-
//##########################
56+
//=================================
5657
// LAUNCHERS
5758

5859
loadLaunchers();
5960

6061

61-
//##########################
62+
//=================================
6263
//Savegame-Sync
6364
ui->le_sync_path->setText(db->getTextPref("sync_target", ""));
6465
ui->sb_sync_backups->setValue(db->getIntPref("sync_No_of_Backups", 0));
@@ -68,6 +69,47 @@ FSettingsDialog::FSettingsDialog(FDB *db, QWidget *parent) :
6869
ui->cb_gen_useTrayIcon->setChecked(db->getBoolPref("useTrayIcon", true));
6970

7071

72+
//=================================
73+
// Log-Files
74+
loadLogfiles();
75+
76+
}
77+
78+
void FSettingsDialog::loadLogfiles() {
79+
ui->lw_log_logfiles->clear();
80+
81+
QDir logDir = LibFusion::getWorkingDir().absolutePath() + QDir::separator() + "Logs";
82+
QStringList logfiles = logDir.entryList();
83+
for(QString log : logfiles) {
84+
if(log.length()>3) //do skip "." and ".." and other wrong stuff
85+
ui->lw_log_logfiles->addItem(log);
86+
}
87+
88+
89+
}
90+
91+
void FSettingsDialog::on_pb_log_openFolder_clicked()
92+
{
93+
94+
QDir logDir = LibFusion::getWorkingDir().absolutePath() + QDir::separator() + "Logs";
95+
QDesktopServices::openUrl(logDir.absolutePath());
96+
}
97+
98+
void FSettingsDialog::on_pb_log_clear_clicked()
99+
{
100+
if(QMessageBox::question(this, "Please Confirm", "Do you really want to delete all Logfiles?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
101+
return;
102+
103+
QDir logDir = LibFusion::getWorkingDir().absolutePath() + QDir::separator() + "Logs";
104+
QStringList logfiles = logDir.entryList();
105+
for(QString log : logfiles) {
106+
if(log.length()>3) //do skip "." and ".." and other wrong stuff
107+
{
108+
QFile::remove(logDir.absolutePath() + "/" + log); // logfile(logDir + "/" + log);
109+
}
110+
}
111+
112+
loadLogfiles();
71113
}
72114

73115
FSettingsDialog::~FSettingsDialog()
@@ -100,6 +142,13 @@ void FSettingsDialog::on_listWidget_currentRowChanged(int i)
100142
ui->settingPages->setCurrentIndex(i);
101143
}
102144

145+
void FSettingsDialog::on_lw_log_logfiles_itemDoubleClicked(QListWidgetItem *item)
146+
{
147+
QDir logDir = LibFusion::getWorkingDir().absolutePath() + QDir::separator() + "Logs";
148+
QString filename = item->text();
149+
QDesktopServices::openUrl(logDir.absolutePath() + "/" + filename);
150+
}
151+
103152
void FSettingsDialog::on_pb_selectStylesheet_clicked()
104153
{
105154
QString stylesheetFile = QFileDialog::getOpenFileName(this, tr("Choose stylesheet"), QDir::homePath(), "*.qss");

‎fsettingsdialog.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,13 @@ class FSettingsDialog : public QDialog
3535
FLauncher *selectedLauncher;
3636
void loadLaunchers();
3737
void updateLauncher();
38+
void loadLogfiles();
3839
private slots:
40+
void on_pb_log_openFolder_clicked();
41+
void on_pb_log_clear_clicked();
42+
3943
void on_listWidget_currentRowChanged(int i);
44+
void on_lw_log_logfiles_itemDoubleClicked(QListWidgetItem * item);
4045

4146
void on_pb_selectStylesheet_clicked();
4247
void on_pb_ResetStylesheet_clicked();

0 commit comments

Comments
 (0)