From c9fdea25c1a9149022d423b523ba591e1ed86e3b Mon Sep 17 00:00:00 2001 From: Akos Polster Date: Tue, 2 Nov 2010 19:25:52 +0100 Subject: [PATCH] Fix search dialog title. Add "Exit" to the Symbian menu. Attempt to fix application icon on Symbian. --- dorian.pro | 4 +- mainwindow.cpp | 2 + pkg/symbian/book.svg | 302 ++++++------------------------------------------- pkg/symbian/book.svgt | 46 -------- searchdialog.cpp | 2 +- 5 files changed, 39 insertions(+), 317 deletions(-) delete mode 100644 pkg/symbian/book.svgt diff --git a/dorian.pro b/dorian.pro index 94564a9..7ff9e19 100644 --- a/dorian.pro +++ b/dorian.pro @@ -131,12 +131,12 @@ win32 { } symbian { - ICON = $$PWD/pkg/symbian/book.svgt + ICON = $$PWD/pkg/symbian/book.svg TARGET.UID3 = 0xEA633557 TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x080000 0x4000000 # FIXME: Include path to OpenC ZLIB? - INCLUDEPATH += c:/Qt/4.7.0/src/3rdparty/zlib + INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib HEADERS += widgets/flickcharm.h SOURCES += widgets/flickcharm.cpp } diff --git a/mainwindow.cpp b/mainwindow.cpp index 493374f..f99ada6 100755 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -99,6 +99,8 @@ MainWindow::MainWindow(QWidget *parent): addToolBarSpace(); fullScreenAction = addToolBarAction(this, SLOT(showBig()), "view-fullscreen", tr("Full screen")); +#else + (void)addToolBarAction(this, SLOT(close()), "", tr("Exit")); #endif // Buttons on top of the book view diff --git a/pkg/symbian/book.svg b/pkg/symbian/book.svg index d37b6fa..70f1ff5 100644 --- a/pkg/symbian/book.svg +++ b/pkg/symbian/book.svg @@ -1,268 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Addess Book - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - address - contact - book - office - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pkg/symbian/book.svgt b/pkg/symbian/book.svgt deleted file mode 100644 index 0b81798..0000000 --- a/pkg/symbian/book.svgt +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/searchdialog.cpp b/searchdialog.cpp index f5faf1d..bc5256c 100644 --- a/searchdialog.cpp +++ b/searchdialog.cpp @@ -6,7 +6,7 @@ SearchDialog::SearchDialog(QWidget *parent): Dyalog(parent) { - setWindowTitle(tr("SearchDialog")); + setWindowTitle(tr("Search the Web")); QLabel *titleLabel = new QLabel(tr("Title:"), this); title = new QLineEdit(this); -- 1.7.9.5