From 619ad20d40b560853e9111b68a4f1a0004aa3dce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mateusz=20P=C3=B3=C5=82rola?= Date: Fri, 20 Aug 2010 11:45:57 +0200 Subject: [PATCH] Moved icons from resources to data/ fixed bug with segmentation fault when starting application --- data/icons/48x48/edit-select-all.png | Bin 0 -> 1836 bytes data/icons/64x64/mdictionary.png | Bin 9194 -> 4497 bytes data/icons/96x96/staroff.png | Bin 0 -> 5654 bytes data/icons/96x96/staron.png | Bin 0 -> 5772 bytes data/icons/gui.qrc | 8 ++++ data/icons/logo/mdictionary.png | Bin 0 -> 9194 bytes debian/rules | 2 +- trunk/src/base/base.pro | 5 +- trunk/src/base/gui/AboutWidget.cpp | 72 ++++++++++++++-------------- trunk/src/base/gui/MainWindow.cpp | 66 ++++++++++++------------- trunk/src/base/gui/MainWindow.h | 7 +-- trunk/src/base/gui/MainWindow.ui | 36 -------------- trunk/src/base/gui/SearchBarWidget.cpp | 6 +-- trunk/src/base/gui/SettingsWidget.cpp | 58 ++++++++++++---------- trunk/src/base/gui/TranslationWidget.cpp | 37 +++++++++----- trunk/src/base/gui/TranslationWidget.h | 1 + trunk/src/base/gui/WelcomeScreenWidget.cpp | 2 +- trunk/src/base/gui/WordListProxyStyle.cpp | 4 +- trunk/src/base/gui/WordListWidget.cpp | 26 ++++++++-- trunk/src/base/gui/WordListWidget.h | 2 + trunk/src/base/gui/gui.qrc | 7 --- trunk/src/base/gui/main.cpp | 10 ++-- trunk/src/base/gui/mdictionary.png | Bin 9194 -> 0 bytes trunk/src/base/gui/staroff.png | Bin 5787 -> 0 bytes trunk/src/base/gui/staron.png | Bin 7430 -> 0 bytes 25 files changed, 175 insertions(+), 174 deletions(-) create mode 100644 data/icons/48x48/edit-select-all.png create mode 100644 data/icons/96x96/staroff.png create mode 100644 data/icons/96x96/staron.png create mode 100644 data/icons/gui.qrc create mode 100755 data/icons/logo/mdictionary.png delete mode 100644 trunk/src/base/gui/MainWindow.ui delete mode 100644 trunk/src/base/gui/gui.qrc delete mode 100755 trunk/src/base/gui/mdictionary.png delete mode 100644 trunk/src/base/gui/staroff.png delete mode 100644 trunk/src/base/gui/staron.png diff --git a/data/icons/48x48/edit-select-all.png b/data/icons/48x48/edit-select-all.png new file mode 100644 index 0000000000000000000000000000000000000000..16d253781c1d2f8c3f0f2c10b9faeea81efd310f GIT binary patch literal 1836 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 JLTlKC{})aWNc;c* diff --git a/data/icons/96x96/staroff.png b/data/icons/96x96/staroff.png new file mode 100644 index 0000000000000000000000000000000000000000..3512d5b97b311d1d1483336b1b71cb6212151395 GIT binary patch literal 5654 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 Uf{{Z{uxSfnRqkQRlq^I42lDs4H~;_u literal 0 HcmV?d00001 diff --git a/data/icons/96x96/staron.png b/data/icons/96x96/staron.png new file mode 100644 index 0000000000000000000000000000000000000000..216e23d1bc37a148696875f6641eff252f049353 GIT binary patch literal 5772 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 KMNUMnLSTXy2=1H! literal 0 HcmV?d00001 diff --git a/data/icons/gui.qrc b/data/icons/gui.qrc new file mode 100644 index 0000000..c637dce --- /dev/null +++ b/data/icons/gui.qrc @@ -0,0 +1,8 @@ + + + 48x48/edit-select-all.png + logo/mdictionary.png + 96x96/staroff.png + 96x96/staron.png + + diff --git a/data/icons/logo/mdictionary.png b/data/icons/logo/mdictionary.png new file mode 100755 index 0000000000000000000000000000000000000000..37684258785f624cf1c8ec3d3891a7fc00940cfe GIT binary patch literal 9194 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 JLTlKC{})aWNc;c* literal 0 HcmV?d00001 diff --git a/debian/rules b/debian/rules index 71bcc21..0bfaffc 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ install: build dh_testroot dh_clean -k dh_installdirs - cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install + cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install ./rename-plugins "$(CURDIR)/debian/$(APPNAME)/usr/lib/mdictionary" # Build architecture-independent files here. binary-indep: build install diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro index d902b3c..c87d985 100644 --- a/trunk/src/base/base.pro +++ b/trunk/src/base/base.pro @@ -62,9 +62,10 @@ HEADERS += gui/MainWindow.h \ ../includes/Notify.h \ gui/TranslationTextEdit.h -FORMS += gui/MainWindow.ui +FORMS += -RESOURCES += gui/gui.qrc +RESOURCES += \ + ../../../data/icons/gui.qrc unix { # VARIABLES isEmpty(PREFIX):PREFIX = /usr diff --git a/trunk/src/base/gui/AboutWidget.cpp b/trunk/src/base/gui/AboutWidget.cpp index f363e18..d2edb32 100644 --- a/trunk/src/base/gui/AboutWidget.cpp +++ b/trunk/src/base/gui/AboutWidget.cpp @@ -5,65 +5,65 @@ AboutWidget::AboutWidget(GUIInterface *parent): QDialog(parent) QString infoNote, licenseNote, comarchNote; infoNote = "

mDictionary

"; comarchNote = "
Meamo/Meego Mulitlingual Dictionary
"; - comarchNote += "
Copyright 2006-2010, Comarch S.A.
"; + comarchNote += "
Copyright 2006-2010, Comarch S.A.
"; comarchNote += "http://mdictionary.garage.maemo.org
"; - licenseNote = "

This program is free software: you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation, either version 3 of the License, or\n" - "(at your option) any later version.
" - "This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.
" - "You should have received a copy of the GNU General Public License\n" - "along with this program. If not, see" - "<" - "http://www.gnu.org/licenses/>." - "

"; + licenseNote = QString("

This program is free software: you can redistribute it and/or modify\n")+ + QString("it under the terms of the GNU General Public License as published by\n")+ + QString("the Free Software Foundation, either version 3 of the License, or\n")+ + QString("(at your option) any later version.
")+ + QString("This program is distributed in the hope that it will be useful,\n")+ + QString("but WITHOUT ANY WARRANTY; without even the implied warranty of\n")+ + QString("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n")+ + QString("GNU General Public License for more details.
") + + QString("You should have received a copy of the GNU General Public License
") + + QString("along with this program. If not, see") + + QString("<") + + QString("http://www.gnu.org/licenses/>.") + + QString("

"); setWindowTitle(tr("About")); - mainLayout = new QVBoxLayout(this); + mainLayout = new QVBoxLayout; #ifndef Q_WS_MAEMO_5 - scrollLayout = new QVBoxLayout(this); - scroll = new QScrollArea(this); + scrollLayout = new QVBoxLayout; + scroll = new QScrollArea; w = new QWidget(this); #endif - imageLabel = new QLabel(this); - mainLabel = new QLabel(this); - licenseLabel = new QLabel(this); + imageLabel = new QLabel; + mainLabel = new QLabel; + licenseLabel = new QLabel; - mainLayout->addWidget(imageLabel, 0, Qt::AlignHCenter); - mainLayout->addWidget(mainLabel, 0, Qt::AlignHCenter); - mainLayout->addWidget(licenseLabel, 0, Qt::AlignHCenter); - QImage img(":/icons/mdictionary.png"); + QImage img(":/icons/logo/mdictionary.png"); imageLabel->setPixmap(QPixmap::fromImage(img)); - imageLabel->resize(imageLabel->pixmap()->size()); imageLabel->setMinimumSize(imageLabel->pixmap()->size()); mainLabel->setText(infoNote + comarchNote); mainLabel->setOpenExternalLinks(true); + mainLabel->setMinimumSize(mainLabel->sizeHint()); + - licenseLabel->setText(licenseNote); licenseLabel->setWordWrap(true); + licenseLabel->setText(licenseNote); licenseLabel->setOpenExternalLinks(true); + licenseLabel->setMinimumSize(licenseLabel->sizeHint()); - #ifndef Q_WS_MAEMO_5 - w->setLayout(mainLayout); - scroll->setWidget(w); - scrollLayout->addWidget(scroll, 0, Qt::AlignHCenter); - this->setLayout(scrollLayout); - #endif + mainLayout->addWidget(imageLabel, 0, Qt::AlignHCenter); + mainLayout->addWidget(mainLabel, 0, Qt::AlignHCenter); + mainLayout->addWidget(licenseLabel, 0, Qt::AlignHCenter); - #ifdef Q_WS_MAEMO_5 + + #ifndef Q_WS_MAEMO_5 + w->setLayout(mainLayout); + scroll->setWidget(w); + scrollLayout->addWidget(scroll, 0, Qt::AlignHCenter); + this->setLayout(scrollLayout); + this->resize(img.width()*1.65, img.height()*2.60); + #else setLayout(mainLayout); - mainLayout->addSpacing(20); #endif - - this->resize(img.width()*1.65, img.height()*2.60); } diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp index 34fcec1..24d699b 100644 --- a/trunk/src/base/gui/MainWindow.cpp +++ b/trunk/src/base/gui/MainWindow.cpp @@ -30,11 +30,11 @@ MainWindow::MainWindow(Backbone *backbone, QWidget *parent): - GUIInterface(parent), - ui(new Ui::MainWindow) { + GUIInterface(parent) { this->backbone = backbone; + initializeUI(); connectBackbone(); @@ -45,8 +45,6 @@ MainWindow::MainWindow(Backbone *backbone, QWidget *parent): connectMenu(); connectBookmarksWidget(); - - setExactSearch(false); setWindowTitle("mDictionary"); @@ -55,33 +53,39 @@ MainWindow::MainWindow(Backbone *backbone, QWidget *parent): } MainWindow::~MainWindow() { - delete ui; + } void MainWindow::initializeUI() { - ui->setupUi(this); #ifdef Q_WS_MAEMO_5 setAttribute(Qt::WA_Maemo5StackedWindow); #endif - searchBarWidget = new SearchBarWidget; - - wordListWidget = new WordListWidget; - //translationWidget is antoher stacked window, so we don't add it to layout //only create it with this widget as parent translationWidget = new TranslationWidget(this); + + mainLayout = new QVBoxLayout; + QWidget* w = new QWidget; + w->setLayout(mainLayout); + setCentralWidget(w); + menuBar = new QMenuBar; + setMenuBar(menuBar); + + searchBarWidget = new SearchBarWidget; + + wordListWidget = new WordListWidget; + welcomeScreenWidget = new WelcomeScreenWidget; #ifdef Q_WS_MAEMO_5 //At start we set widget as welcome screen widget - ui->centralWidget->layout()->addWidget(welcomeScreenWidget); - QVBoxLayout* vl = (QVBoxLayout*)(ui->centralWidget->layout()); - vl->addWidget(searchBarWidget, 0, Qt::AlignBottom); + mainLayout->addWidget(welcomeScreenWidget); + mainLayout->addWidget(searchBarWidget, 0, Qt::AlignBottom); #else translationWidget->hide(); //we add to splitter word list and welcome screen @@ -89,12 +93,11 @@ void MainWindow::initializeUI() { splitter->addWidget(wordListWidget); splitter->addWidget(welcomeScreenWidget); splitter->setStretchFactor(1, 150); - ui->centralWidget->layout()->addWidget(splitter); - ui->centralWidget->layout()->addWidget(searchBarWidget); + mainLayout->addWidget(splitter); + mainLayout->addWidget(searchBarWidget); #endif - dictManagerWidget = new DictManagerWidget(this); dictManagerWidget->hide(); @@ -107,7 +110,6 @@ void MainWindow::initializeUI() { aboutWidget = new AboutWidget(this); aboutWidget->hide(); - //creating menus #ifdef Q_WS_MAEMO_5 @@ -116,17 +118,17 @@ void MainWindow::initializeUI() { menuWidget->addSubMenu(tr("Dictionaries"), dictManagerWidget); menuWidget->addSubMenu(tr("Bookmarks"), bookmarksWidget); menuWidget->addSubMenu(tr("About"), aboutWidget); - ui->menuBar->addAction(menuWidget); + menuBar->addAction(menuWidget); #else - dictionariesAction = ui->menuBar->addAction(tr("Dictionaries")); + dictionariesAction = menuBar->addAction(tr("Dictionaries")); connect(dictionariesAction, SIGNAL(triggered()), dictManagerWidget, SLOT(show())); - settingsAction = ui->menuBar->addAction(tr("Settings")); + settingsAction = menuBar->addAction(tr("Settings")); connect(settingsAction, SIGNAL(triggered()), settingsWidget, SLOT(show())); - QMenu* m = ui->menuBar->addMenu(tr("Bookmarks")); + QMenu* m = menuBar->addMenu(tr("Bookmarks")); bookmarksShowAllAction = new QAction(tr("Show all"), m); bookmarksRemoveAllAction = new QAction(tr("Remove all"), m); @@ -134,11 +136,10 @@ void MainWindow::initializeUI() { m->addAction(bookmarksShowAllAction); m->addAction(bookmarksRemoveAllAction); - aboutAction = ui->menuBar->addAction(tr("About")); + aboutAction = menuBar->addAction(tr("About")); connect(aboutAction, SIGNAL(triggered()), aboutWidget, SLOT(show())); #endif - } void MainWindow::closeEvent(QCloseEvent *event) { @@ -167,8 +168,8 @@ void MainWindow::wordListReady() { #ifdef Q_WS_MAEMO_5 //switch welcome screen with word list if(!wordListWidget->isVisible()) { - int i = ui->centralWidget->layout()->indexOf(welcomeScreenWidget); - QBoxLayout* l = (QBoxLayout*)(ui->centralWidget->layout()); + int i = mainLayout->indexOf(welcomeScreenWidget); + QBoxLayout* l = (QBoxLayout*)(mainLayout); l->removeWidget(welcomeScreenWidget); welcomeScreenWidget->deleteLater(); l->insertWidget(0, wordListWidget); @@ -224,7 +225,7 @@ void MainWindow::translationsReady() { #ifndef Q_WS_MAEMO_5 //switch welcome screen with translation widget if(!translationWidget->isVisible()) { - QBoxLayout* l = (QBoxLayout*)(ui->centralWidget->layout()); + QBoxLayout* l = (QBoxLayout*)(mainLayout); QSplitter* s = (QSplitter*)((QWidgetItem*)(l->itemAt(0))->widget()); s->insertWidget(1,translationWidget); s->setStretchFactor(1, 150); @@ -267,7 +268,6 @@ void MainWindow::breakSearching() { void MainWindow::addToHistory(QList trans) { if(trans.count() > 0) { backbone->history()->add(trans[0]->key()); - translationWidget->setWindowTitle(trans[0]->key()); } } @@ -293,21 +293,21 @@ void MainWindow::historyPrev() { void MainWindow::disableMenu() { #ifdef Q_WS_MAEMO_5 - if(ui->menuBar->actions().contains(menuWidget)) { - ui->menuBar->removeAction(menuWidget); + if(menuBar->actions().contains(menuWidget)) { + menuBar->removeAction(menuWidget); } #else - ui->menuBar->setEnabled(false); + menuBar->setEnabled(false); #endif } void MainWindow::enableMenu() { #ifdef Q_WS_MAEMO_5 - if(!ui->menuBar->actions().contains(menuWidget)) { - ui->menuBar->addAction(menuWidget); + if(!menuBar->actions().contains(menuWidget)) { + menuBar->addAction(menuWidget); } #else - ui->menuBar->setEnabled(true); + menuBar->setEnabled(true); #endif } diff --git a/trunk/src/base/gui/MainWindow.h b/trunk/src/base/gui/MainWindow.h index b950080..6e8e44f 100644 --- a/trunk/src/base/gui/MainWindow.h +++ b/trunk/src/base/gui/MainWindow.h @@ -40,9 +40,6 @@ #include "WelcomeScreenWidget.h" #include "AboutWidget.h" -namespace Ui { - class MainWindow; -} //! Implements interface for GUI /*! @@ -204,11 +201,9 @@ protected: private: Backbone* backbone; - Ui::MainWindow *ui; void initializeUI(); - SearchBarWidget* searchBarWidget; QWidget* translationWidget; QWidget* wordListWidget; @@ -218,6 +213,8 @@ private: BookmarksWidget* bookmarksWidget; QWidget* welcomeScreenWidget; AboutWidget* aboutWidget; + QVBoxLayout* mainLayout; + QMenuBar* menuBar; #ifndef Q_WS_MAEMO_5 QSplitter* splitter; diff --git a/trunk/src/base/gui/MainWindow.ui b/trunk/src/base/gui/MainWindow.ui deleted file mode 100644 index 31e98e2..0000000 --- a/trunk/src/base/gui/MainWindow.ui +++ /dev/null @@ -1,36 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 400 - 300 - - - - MainWindow - - - - false - - - - - - - 0 - 0 - 400 - 23 - - - - - - - - diff --git a/trunk/src/base/gui/SearchBarWidget.cpp b/trunk/src/base/gui/SearchBarWidget.cpp index 82ccd2e..6534ef3 100644 --- a/trunk/src/base/gui/SearchBarWidget.cpp +++ b/trunk/src/base/gui/SearchBarWidget.cpp @@ -185,7 +185,7 @@ void SearchBarWidget::initializeUI() { clearSearchWordToolButton->sizeHint().height()*2); #endif - fullScreenToolButton = new QToolButton(); + /*fullScreenToolButton = new QToolButton(); #ifdef Q_WS_MAEMO_5 fullScreenToolButton->setIcon( generateIcon(QIcon::fromTheme("general_fullsize"))); @@ -195,7 +195,7 @@ void SearchBarWidget::initializeUI() { fullScreenToolButton->setMinimumSize( fullScreenToolButton->sizeHint().height()*2, fullScreenToolButton->sizeHint().height()*2); - #endif + #endif*/ searchingProgressBar = new QProgressBar(); @@ -219,7 +219,7 @@ void SearchBarWidget::initializeUI() { horizontalLayout->addWidget(historyPrevToolButton); horizontalLayout->addWidget(historyShowToolButton); horizontalLayout->addWidget(historyNextToolButton); - horizontalLayout->addWidget(fullScreenToolButton); + // horizontalLayout->addWidget(fullScreenToolButton); //adding clear toolButton to textEdit with right alignment lineEditLayout->addWidget(clearSearchWordToolButton, 0, diff --git a/trunk/src/base/gui/SettingsWidget.cpp b/trunk/src/base/gui/SettingsWidget.cpp index 937aee1..2d72d99 100644 --- a/trunk/src/base/gui/SettingsWidget.cpp +++ b/trunk/src/base/gui/SettingsWidget.cpp @@ -65,6 +65,8 @@ SettingsWidget::SettingsWidget(GUIInterface *parent) : verticalLayout->addWidget(searchInBookmarksCheckBox); + settings = 0; + #ifndef Q_WS_MAEMO_5 setMinimumWidth(250); setMaximumWidth(250); @@ -73,9 +75,9 @@ SettingsWidget::SettingsWidget(GUIInterface *parent) : void SettingsWidget::showEvent(QShowEvent *e) { - settings = guiInterface->settings(); + settings = guiInterface->settings(); - historySizeSpinBox->setValue( + historySizeSpinBox->setValue( settings->value("history_size").toInt()); searchResultSizeSpinBox->setValue( @@ -95,30 +97,36 @@ void SettingsWidget::showEvent(QShowEvent *e) { } void SettingsWidget::hideEvent(QHideEvent *e) { - Settings* newSettings = new Settings; - newSettings->setValue("history_size", - QString::number(historySizeSpinBox->value())); - newSettings->setValue("search_limit", - QString::number(searchResultSizeSpinBox->value())); - - if(searchInDictionariesCheckBox->isChecked()) - newSettings->setValue("search_dictionaries", "true"); - else - newSettings->setValue("search_dictionaries", "false"); + QDialog::hideEvent(e); - if(searchInBookmarksCheckBox->isChecked()) - newSettings->setValue("search_bookmarks", "true"); - else - newSettings->setValue("search_bookmarks", "false"); - - //setting new settings only if their are different that old ones - QString key; - foreach(key, newSettings->keys()) { - if(settings->value(key) != newSettings->value(key)) { - guiInterface->setSettings(newSettings); - break; + if(settings) { + Settings* newSettings = new Settings; + newSettings->setValue("history_size", + QString::number(historySizeSpinBox->value())); + newSettings->setValue("search_limit", + QString::number( + searchResultSizeSpinBox->value())); + + if(searchInDictionariesCheckBox->isChecked()) + newSettings->setValue("search_dictionaries", "true"); + else + newSettings->setValue("search_dictionaries", "false"); + + if(searchInBookmarksCheckBox->isChecked()) + newSettings->setValue("search_bookmarks", "true"); + else + newSettings->setValue("search_bookmarks", "false"); + + //setting new settings only if their are different that old ones + QString key; + foreach(key, newSettings->keys()) { + if(settings->value(key) != newSettings->value(key)) { + guiInterface->setSettings(newSettings); + break; + } } - } - QDialog::hideEvent(e); + delete settings; + settings = 0; + } } diff --git a/trunk/src/base/gui/TranslationWidget.cpp b/trunk/src/base/gui/TranslationWidget.cpp index 16216c2..2589afc 100644 --- a/trunk/src/base/gui/TranslationWidget.cpp +++ b/trunk/src/base/gui/TranslationWidget.cpp @@ -33,17 +33,19 @@ TranslationWidget::TranslationWidget(QWidget *parent): QScrollArea(parent) { + qDebug()<") + tr("\n ") + trans + tr("\n "); + trans=QString("") + + QString("\n ") + trans + QString("\n "); // trans.replace("&","&"); trans=XslConversion(trans); qDebug()<addWidget(textEdit); - textEdit->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - textEdit->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - + #ifndef Q_WS_MAEMO_5 + textEdit->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + textEdit->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + #endif this->setWidget(w); this->setWidgetResizable(true); - #ifdef Q_WS_MAEMO_5 zoomInButton = new QToolButton(this); zoomInButton->setIcon(QIcon::fromTheme("pdf_zoomin")); @@ -223,7 +227,7 @@ void TranslationWidget::initializeUI() { zoomOutButton->setMinimumSize(zoomOutButton->sizeHint()); selectAllButton = new QToolButton(this); - selectAllButton->setIcon(QIcon::fromTheme("pdf_zoomout")); + selectAllButton->setIcon(QIcon(":/icons/48x48/edit-select-all.png")); selectAllButton->setMinimumSize(selectAllButton->sizeHint()); copyButton = new QToolButton(this); @@ -237,7 +241,7 @@ void TranslationWidget::initializeUI() { searchButton->setEnabled(false); showButtonsButton = new QToolButton(this); - showButtonsButton->setArrowType(Qt::UpArrow); + showButtonsButton->setIcon(QIcon::fromTheme("general_sent")); showButtonsButton->setMinimumSize(searchButton->sizeHint()); connect(zoomInButton, SIGNAL(clicked()), @@ -284,13 +288,13 @@ void TranslationWidget::showButtons() { buttonsAnimation->start(); buttonsVisible = true; - showButtonsButton->setArrowType(Qt::DownArrow); + showButtonsButton->setIcon(QIcon::fromTheme("general_received")); } else if(buttonsVisible) { buttonsAnimation->setDirection(QAbstractAnimation::Backward); buttonsAnimation->start(); buttonsVisible = false; - showButtonsButton->setArrowType(Qt::UpArrow); + showButtonsButton->setIcon(QIcon::fromTheme("general_sent")); } } @@ -316,6 +320,13 @@ void TranslationWidget::grabZoomKeys(bool grab) { 1); } +void TranslationWidget::hideEvent(QHideEvent* e) { + if(buttonsVisible) + showButtons(); + + QScrollArea::hideEvent(e); +} + void TranslationWidget::keyPressEvent(QKeyEvent* event) { switch (event->key()) { case Qt::Key_F7: diff --git a/trunk/src/base/gui/TranslationWidget.h b/trunk/src/base/gui/TranslationWidget.h index c9134d3..46ac8c1 100644 --- a/trunk/src/base/gui/TranslationWidget.h +++ b/trunk/src/base/gui/TranslationWidget.h @@ -59,6 +59,7 @@ public Q_SLOTS: protected: #ifdef Q_WS_MAEMO_5 void keyPressEvent(QKeyEvent *); + void hideEvent(QHideEvent *); #endif private Q_SLOTS: diff --git a/trunk/src/base/gui/WelcomeScreenWidget.cpp b/trunk/src/base/gui/WelcomeScreenWidget.cpp index e72c88c..953b590 100644 --- a/trunk/src/base/gui/WelcomeScreenWidget.cpp +++ b/trunk/src/base/gui/WelcomeScreenWidget.cpp @@ -41,7 +41,7 @@ WelcomeScreenWidget::WelcomeScreenWidget(QWidget *parent) : mainLayout->addWidget(mainLabel, 0, Qt::AlignCenter); mainLayout->addStretch(0); - QImage img(":/icons/mdictionary.png"); + QImage img(":/icons/logo/mdictionary.png"); imageLabel->setPixmap(QPixmap::fromImage(img)); imageLabel->resize(imageLabel->pixmap()->size()); diff --git a/trunk/src/base/gui/WordListProxyStyle.cpp b/trunk/src/base/gui/WordListProxyStyle.cpp index 571ba9b..0d60b72 100644 --- a/trunk/src/base/gui/WordListProxyStyle.cpp +++ b/trunk/src/base/gui/WordListProxyStyle.cpp @@ -28,8 +28,8 @@ WordListProxyStyle::WordListProxyStyle() : QProxyStyle() { //load pixmap from resources - starPixmapOn = QPixmap(":/icons/staron.png"); - starPixmapOff = QPixmap(":/icons/staroff.png"); + starPixmapOn = QPixmap(":/icons/96x96/staron.png"); + starPixmapOff = QPixmap(":/icons/96x96/staroff.png"); } diff --git a/trunk/src/base/gui/WordListWidget.cpp b/trunk/src/base/gui/WordListWidget.cpp index dcca883..bde5e7b 100644 --- a/trunk/src/base/gui/WordListWidget.cpp +++ b/trunk/src/base/gui/WordListWidget.cpp @@ -91,16 +91,17 @@ void WordListWidget::addWord(QString word, int row) { void WordListWidget::showSearchResults( QHash > result) { - model->clear(); - searchResult.clear(); + clear(); + qDebug()<setColumnCount(2); model->setRowCount(result.count()); - searchResult = result; int row=0; QHash >::iterator i; - for(i = result.begin(); i != result.end(); i++) { + for(i = searchResult.begin(); i != searchResult.end(); i++) { addWord(i.key(), row++); } @@ -110,6 +111,7 @@ void WordListWidget::showSearchResults( void WordListWidget::wordClicked(QModelIndex index) { //we're getting translation based on data in index + qDebug()<dictionaryInfo(); emit showTranslation( searchResult[index.data().toString()]); } @@ -173,7 +175,7 @@ void WordListWidget::resizeEvent(QResizeEvent *event) { } void WordListWidget::resizeColumns() { - setColumnWidth(0, viewport()->width() -checkBoxWidth - 20); + setColumnWidth(0, viewport()->width() -checkBoxWidth); setColumnWidth(1, checkBoxWidth); } @@ -184,3 +186,17 @@ void WordListWidget::lockList() { void WordListWidget::unlockList() { setEnabled(true); } + +void WordListWidget::clear() { + model->clear(); + qDebug()<<"asdasdas"; + + /* QHash >::iterator i; + for(i = searchResult.begin(); i != searchResult.end(); i++) { + Translation*t; + foreach(t, i.value()) { + delete t; + } + }*/ + searchResult.clear(); +} diff --git a/trunk/src/base/gui/WordListWidget.h b/trunk/src/base/gui/WordListWidget.h index 9dc011f..1ff0c12 100644 --- a/trunk/src/base/gui/WordListWidget.h +++ b/trunk/src/base/gui/WordListWidget.h @@ -89,6 +89,8 @@ private Q_SLOTS: //! Signal is emitted only when star was clicked. void wordChecked(QModelIndex index); + void clear(); + private: //! Adds word to model. Row is row in the model void addWord(QString word, int row); diff --git a/trunk/src/base/gui/gui.qrc b/trunk/src/base/gui/gui.qrc deleted file mode 100644 index dc740a5..0000000 --- a/trunk/src/base/gui/gui.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - staroff.png - staron.png - mdictionary.png - - diff --git a/trunk/src/base/gui/main.cpp b/trunk/src/base/gui/main.cpp index fe6a9c3..c5879c5 100644 --- a/trunk/src/base/gui/main.cpp +++ b/trunk/src/base/gui/main.cpp @@ -60,13 +60,13 @@ int main(int argc, char *argv[]) { qRegisterMetaType("Translation*"); qRegisterMetaType >("QList"); - Backbone* backbone = new Backbone; - MainWindow* w = new MainWindow(backbone); - w->show(); + Backbone backbone; + MainWindow w(&backbone); + w.show(); if(search.count() > 0) { - w->setExactSearch(true); - w->searchExact(search[0]); + w.setExactSearch(true); + w.searchExact(search[0]); } return a.exec(); diff --git a/trunk/src/base/gui/mdictionary.png b/trunk/src/base/gui/mdictionary.png deleted file mode 100755 index 37684258785f624cf1c8ec3d3891a7fc00940cfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9194 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 JLTlKC{})aWNc;c* diff --git a/trunk/src/base/gui/staroff.png b/trunk/src/base/gui/staroff.png deleted file mode 100644 index 7b0c1bcd623f900302c002d5942a1411c7f12fdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5787 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 -- 1.7.9.5