Skip to content

Commit 671ad8b

Browse files
juzzlinjuzzlin
committed
Add What's New dialog
1 parent 52f9c4b commit 671ad8b

9 files changed

+199
-41
lines changed

‎CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ x.y.z
33

44
New features:
55

6+
* Add What's New dialog
7+
- Help => What's New
8+
69
Bug fixes:
710

811
Other:

‎heimer.pro

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ HEADERS += \
5757
$$SRC/state_machine.hpp \
5858
$$SRC/text_edit.hpp \
5959
$$SRC/undo_stack.hpp \
60+
$$SRC/whats_new_dlg.hpp \
6061
$$SRC/writer.hpp \
6162
$$SRC/contrib/SimpleLogger/src/simple_logger.hpp \
6263

@@ -96,6 +97,7 @@ SOURCES += \
9697
$$SRC/state_machine.cpp \
9798
$$SRC/text_edit.cpp \
9899
$$SRC/undo_stack.cpp \
100+
$$SRC/whats_new_dlg.cpp \
99101
$$SRC/writer.cpp \
100102
$$SRC/contrib/SimpleLogger/src/simple_logger.cpp \
101103

@@ -106,7 +108,7 @@ $$SRC/translations/heimer_fi.ts \
106108
$$SRC/translations/heimer_fr.ts \
107109
$$SRC/translations/heimer_it.ts
108110

109-
RESOURCES += data/icons/icons.qrc data/images/images.qrc
111+
RESOURCES += meta.qrc data/icons/icons.qrc data/images/images.qrc
110112
RC_FILE = data/icons/WindowsHeimer.rc
111113

112114
data.files = AUTHORS CHANGELOG COPYING README

‎meta.qrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file>CHANGELOG</file>
4+
</qresource>
5+
</RCC>
6+

‎src/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ set(SRC
5353
undo_stack.cpp
5454
user_exception.hpp
5555
layers.hpp
56+
whats_new_dlg.cpp
5657
writer.cpp
5758
)
5859

@@ -61,6 +62,7 @@ set(SRC
6162
configure_file(${CMAKE_SOURCE_DIR}/data/translations/translations.qrc ${CMAKE_BINARY_DIR}/data/translations/translations.qrc COPYONLY)
6263

6364
set(RCS
65+
${CMAKE_SOURCE_DIR}/meta.qrc
6466
${CMAKE_SOURCE_DIR}/data/images/images.qrc
6567
${CMAKE_SOURCE_DIR}/data/icons/icons.qrc
6668
${CMAKE_BINARY_DIR}/data/translations/translations.qrc

‎src/main_window.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "constants.hpp"
2020
#include "mediator.hpp"
2121
#include "simple_logger.hpp"
22+
#include "whats_new_dlg.hpp"
2223

2324
#include <QAction>
2425
#include <QApplication>
@@ -45,6 +46,7 @@ static const auto threeDots = "...";
4546

4647
MainWindow::MainWindow()
4748
: m_aboutDlg(new AboutDlg(this))
49+
, m_whatsNewDlg(new WhatsNewDlg(this))
4850
{
4951
if (!m_instance) {
5052
m_instance = this;
@@ -295,6 +297,13 @@ void MainWindow::createHelpMenu()
295297
const auto aboutQtAct = new QAction(tr("About &Qt"), this);
296298
helpMenu->addAction(aboutQtAct);
297299
connect(aboutQtAct, SIGNAL(triggered()), this, SLOT(showAboutQtDlg()));
300+
301+
helpMenu->addSeparator();
302+
303+
// Add "What's new"-action
304+
const auto whatsNewAct = new QAction(tr("What's New"), this);
305+
helpMenu->addAction(whatsNewAct);
306+
connect(whatsNewAct, SIGNAL(triggered()), this, SLOT(showWhatsNewDlg()));
298307
}
299308

300309
void MainWindow::createToolBar()
@@ -472,6 +481,11 @@ void MainWindow::showAboutQtDlg()
472481
QMessageBox::aboutQt(this, tr("About Qt"));
473482
}
474483

484+
void MainWindow::showWhatsNewDlg()
485+
{
486+
m_whatsNewDlg->exec();
487+
}
488+
475489
void MainWindow::saveWindowSize()
476490
{
477491
QSettings settings;

‎src/main_window.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class QTextEdit;
3737
class QWidgetAction;
3838
class Mediator;
3939
class Node;
40+
class WhatsNewDlg;
4041

4142
class MainWindow : public QMainWindow
4243
{
@@ -110,6 +111,8 @@ private slots:
110111

111112
void showAboutQtDlg();
112113

114+
void showWhatsNewDlg();
115+
113116
private:
114117
void addRedoAction(QMenu & menu);
115118

@@ -137,6 +140,8 @@ private slots:
137140

138141
AboutDlg * m_aboutDlg;
139142

143+
WhatsNewDlg * m_whatsNewDlg;
144+
140145
QAction * m_saveAction = nullptr;
141146

142147
QAction * m_saveAsAction = nullptr;

‎src/translations/heimer_fi.ts

Lines changed: 53 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -32,67 +32,67 @@
3232
<context>
3333
<name>Application</name>
3434
<message>
35-
<location filename="../application.cpp" line="157"/>
35+
<location filename="../application.cpp" line="160"/>
3636
<source>Heimer Files</source>
3737
<translation>Heimer -tiedostot</translation>
3838
</message>
3939
<message>
40-
<location filename="../application.cpp" line="230"/>
40+
<location filename="../application.cpp" line="233"/>
4141
<source>Open File</source>
4242
<translation>Avaa tiedosto</translation>
4343
</message>
4444
<message>
45-
<location filename="../application.cpp" line="258"/>
45+
<location filename="../application.cpp" line="261"/>
4646
<source>Failed to save file.</source>
4747
<translation>Tiedoston tallentaminen epäonnistui</translation>
4848
</message>
4949
<message>
50-
<location filename="../application.cpp" line="275"/>
50+
<location filename="../application.cpp" line="278"/>
5151
<source>Save File As</source>
5252
<translation>Tallenna Nimellä</translation>
5353
</message>
5454
<message>
55-
<location filename="../application.cpp" line="288"/>
55+
<location filename="../application.cpp" line="291"/>
5656
<source>File &apos;</source>
5757
<translation>Tiedosto &apos;</translation>
5858
</message>
5959
<message>
60-
<location filename="../application.cpp" line="288"/>
60+
<location filename="../application.cpp" line="291"/>
6161
<source>&apos; saved.</source>
6262
<translation>&apos; tallennettu.</translation>
6363
</message>
6464
<message>
65-
<location filename="../application.cpp" line="292"/>
65+
<location filename="../application.cpp" line="295"/>
6666
<source>Failed to save file as &apos;</source>
6767
<translation>Tietoston tallentaminen epäonnistui nimellä &apos;</translation>
6868
</message>
6969
<message>
70-
<location filename="../application.cpp" line="356"/>
70+
<location filename="../application.cpp" line="359"/>
7171
<source>Open an image</source>
7272
<translation>Avaa kuvatiedosto</translation>
7373
</message>
7474
<message>
75-
<location filename="../application.cpp" line="356"/>
75+
<location filename="../application.cpp" line="359"/>
7676
<source>Image Files</source>
7777
<translation>Kuvatiedostot</translation>
7878
</message>
7979
<message>
80-
<location filename="../application.cpp" line="369"/>
80+
<location filename="../application.cpp" line="372"/>
8181
<source>Load image</source>
8282
<translation>Kuvanlataus</translation>
8383
</message>
8484
<message>
85-
<location filename="../application.cpp" line="369"/>
85+
<location filename="../application.cpp" line="372"/>
8686
<source>Failed to load image &apos;</source>
8787
<translation>Kuvan lataaminen epäonnistui: &apos;</translation>
8888
</message>
8989
<message>
90-
<location filename="../application.cpp" line="392"/>
90+
<location filename="../application.cpp" line="395"/>
9191
<source>The mind map has been modified.</source>
9292
<translation>Käsitekarttaa on muokattu.</translation>
9393
</message>
9494
<message>
95-
<location filename="../application.cpp" line="393"/>
95+
<location filename="../application.cpp" line="396"/>
9696
<source>Do you want to save your changes?</source>
9797
<translation>Haluatko tallentaa muutokset?</translation>
9898
</message>
@@ -287,122 +287,127 @@
287287
<context>
288288
<name>MainWindow</name>
289289
<message>
290-
<location filename="../main_window.cpp" line="58"/>
290+
<location filename="../main_window.cpp" line="60"/>
291291
<source>Redo</source>
292292
<translation>Tee Uudelleen</translation>
293293
</message>
294294
<message>
295-
<location filename="../main_window.cpp" line="73"/>
295+
<location filename="../main_window.cpp" line="75"/>
296296
<source>Undo</source>
297297
<translation>Kumoa</translation>
298298
</message>
299299
<message>
300-
<location filename="../main_window.cpp" line="88"/>
300+
<location filename="../main_window.cpp" line="90"/>
301301
<source>&amp;Edit</source>
302302
<translation>&amp;Muokkaa</translation>
303303
</message>
304304
<message>
305-
<location filename="../main_window.cpp" line="96"/>
305+
<location filename="../main_window.cpp" line="98"/>
306306
<source>Set background color</source>
307307
<translation>Aseta taustaväri</translation>
308308
</message>
309309
<message>
310-
<location filename="../main_window.cpp" line="107"/>
310+
<location filename="../main_window.cpp" line="109"/>
311311
<source>Set edge color</source>
312312
<translation>Aseta kaaren väri</translation>
313313
</message>
314314
<message>
315-
<location filename="../main_window.cpp" line="129"/>
315+
<location filename="../main_window.cpp" line="131"/>
316316
<source>Corner radius:</source>
317317
<translation>Kulman pyöreys:</translation>
318318
</message>
319319
<message>
320-
<location filename="../main_window.cpp" line="155"/>
320+
<location filename="../main_window.cpp" line="157"/>
321321
<source>Edge width:</source>
322322
<translation>Kaaren leveys:</translation>
323323
</message>
324324
<message>
325-
<location filename="../main_window.cpp" line="180"/>
325+
<location filename="../main_window.cpp" line="182"/>
326326
<source>Text size:</source>
327327
<translation>Tekstin koko:</translation>
328328
</message>
329329
<message>
330-
<location filename="../main_window.cpp" line="205"/>
330+
<location filename="../main_window.cpp" line="207"/>
331331
<source>Grid size:</source>
332332
<translation>Ruudukko:</translation>
333333
</message>
334334
<message>
335-
<location filename="../main_window.cpp" line="222"/>
335+
<location filename="../main_window.cpp" line="224"/>
336336
<source>&amp;File</source>
337337
<translation>&amp;Tiedosto</translation>
338338
</message>
339339
<message>
340-
<location filename="../main_window.cpp" line="225"/>
340+
<location filename="../main_window.cpp" line="227"/>
341341
<source>&amp;New</source>
342342
<translation>&amp;Uusi</translation>
343343
</message>
344344
<message>
345-
<location filename="../main_window.cpp" line="233"/>
345+
<location filename="../main_window.cpp" line="235"/>
346346
<source>&amp;Open</source>
347347
<translation>&amp;Avaa</translation>
348348
</message>
349349
<message>
350-
<location filename="../main_window.cpp" line="243"/>
350+
<location filename="../main_window.cpp" line="245"/>
351351
<source>&amp;Save</source>
352352
<translation>&amp;Tallenna</translation>
353353
</message>
354354
<message>
355-
<location filename="../main_window.cpp" line="252"/>
355+
<location filename="../main_window.cpp" line="254"/>
356356
<source>&amp;Save as</source>
357357
<translation>&amp;Tallenna Nimellä</translation>
358358
</message>
359359
<message>
360-
<location filename="../main_window.cpp" line="263"/>
360+
<location filename="../main_window.cpp" line="265"/>
361361
<source>&amp;Export to PNG image</source>
362362
<translation>&amp;Vie PNG-kuvaksi</translation>
363363
</message>
364364
<message>
365-
<location filename="../main_window.cpp" line="273"/>
365+
<location filename="../main_window.cpp" line="275"/>
366366
<source>&amp;Quit</source>
367367
<translation>&amp;Poistu</translation>
368368
</message>
369369
<message>
370-
<location filename="../main_window.cpp" line="287"/>
370+
<location filename="../main_window.cpp" line="289"/>
371371
<source>&amp;Help</source>
372372
<translation>&amp;Apua</translation>
373373
</message>
374374
<message>
375-
<location filename="../main_window.cpp" line="290"/>
375+
<location filename="../main_window.cpp" line="292"/>
376376
<source>&amp;About</source>
377377
<translation>&amp;Tietoa</translation>
378378
</message>
379379
<message>
380-
<location filename="../main_window.cpp" line="295"/>
380+
<location filename="../main_window.cpp" line="297"/>
381381
<source>About &amp;Qt</source>
382382
<translation>Tietoa &amp;Qt:sta</translation>
383383
</message>
384384
<message>
385-
<location filename="../main_window.cpp" line="315"/>
385+
<location filename="../main_window.cpp" line="304"/>
386+
<source>What&apos;s New</source>
387+
<translation>Uutta Tässä Versiossa</translation>
388+
</message>
389+
<message>
390+
<location filename="../main_window.cpp" line="324"/>
386391
<source>&amp;View</source>
387392
<translation>&amp;Näkymä</translation>
388393
</message>
389394
<message>
390-
<location filename="../main_window.cpp" line="318"/>
395+
<location filename="../main_window.cpp" line="327"/>
391396
<source>Full Screen</source>
392397
<translation>Koko Näyttö</translation>
393398
</message>
394399
<message>
395-
<location filename="../main_window.cpp" line="333"/>
400+
<location filename="../main_window.cpp" line="342"/>
396401
<source>Zoom In</source>
397402
<translation>Suurenna</translation>
398403
</message>
399404
<message>
400-
<location filename="../main_window.cpp" line="339"/>
405+
<location filename="../main_window.cpp" line="348"/>
401406
<source>Zoom Out</source>
402407
<translation>Loitonna</translation>
403408
</message>
404409
<message>
405-
<location filename="../main_window.cpp" line="347"/>
410+
<location filename="../main_window.cpp" line="356"/>
406411
<source>&amp;Zoom To Fit</source>
407412
<translation>&amp;Sovita</translation>
408413
</message>
@@ -411,12 +416,12 @@
411416
<translation type="vanished">Heimer -tiedostot</translation>
412417
</message>
413418
<message>
414-
<location filename="../main_window.cpp" line="389"/>
419+
<location filename="../main_window.cpp" line="398"/>
415420
<source>New File</source>
416421
<translation>Uusi tiedosto</translation>
417422
</message>
418423
<message>
419-
<location filename="../main_window.cpp" line="391"/>
424+
<location filename="../main_window.cpp" line="400"/>
420425
<source>Not Saved</source>
421426
<translation>Ei tallennettu</translation>
422427
</message>
@@ -437,7 +442,7 @@
437442
<translation type="vanished">Avaa tiedosto</translation>
438443
</message>
439444
<message>
440-
<location filename="../main_window.cpp" line="472"/>
445+
<location filename="../main_window.cpp" line="481"/>
441446
<source>About Qt</source>
442447
<translation>Tietoa Qt:sta</translation>
443448
</message>
@@ -543,4 +548,12 @@
543548
<translation>Korruptoitunut tiedosto: &apos;</translation>
544549
</message>
545550
</context>
551+
<context>
552+
<name>WhatsNewDlg</name>
553+
<message>
554+
<location filename="../whats_new_dlg.cpp" line="29"/>
555+
<source>What&apos;s New</source>
556+
<translation>Uutta Tässä Versiossa</translation>
557+
</message>
558+
</context>
546559
</TS>

0 commit comments

Comments
 (0)