Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks

Conflicts:
	trunk/src/base/base.pro
	trunk/src/base/gui/MainWindow.cpp
	trunk/src/base/gui/MainWindow.h

diff --cc trunk/src/base/base.pro
index 8d9d258,edfdf26..590366f
--- 1/trunk/src/base/base.pro
--- 2/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@@ -36,10 -25,8 +25,12 @@@ SOURCES += gui/main.cpp 
      gui/WordListProxyStyle.cpp \
      backbone/Bookmarks.cpp \
      gui/SettingsWidget.cpp \
 +    gui/BookmarksWidget.cpp \
-     gui/WelcomeScreenWidget.cpp
++    gui/WelcomeScreenWidget.cpp \ 
+     gui/AboutWidget.cpp
 -HEADERS += gui/MainWindow.h \
 +
 +HEADERS  += gui/MainWindow.h \
++    gui/AboutWidget.h \
      gui/SearchBarWidget.h \
      gui/WordListWidget.h \
      gui/TranslationWidget.h \
@@@ -59,42 -46,33 +50,66 @@@
      backbone/Bookmarks.h \
      backbone/BookmarkTranslations.h \
      gui/SettingsWidget.h \
 -    gui/AboutWidget.h
 -FORMS += gui/MainWindow.ui
 +    gui/BookmarksWidget.h \
 +    gui/WelcomeScreenWidget.h
 +
 +FORMS    += gui/MainWindow.ui
++RESOURCES += gui/gui.qrc
 +
 +unix {
 +  #VARIABLES
 +  isEmpty(PREFIX) {
 +    PREFIX = /usr
 +  }
 +  BINDIR = $$PREFIX/bin
 +  DATADIR =$$PREFIX/share
 +
 +  DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
 +
 +  #MAKE INSTALL
 +
 +  INSTALLS += target desktop icon64 configs
 +
 +  configs.path = ~/.mdictionary
 +  configs.files += ../../../data/mdictionary.defaults
 +
 +  target.path =$$BINDIR
 +
 +maemo5 {
 +  desktop.path = $$DATADIR/applications/hildon
 +  icon64.path = $$DATADIR/icons/hicolor/64x64/hildon
 +}
 +
 +!maemo5 {
 +  desktop.path = $$DATADIR/applications
 +  icon64.path = $$DATADIR/icons
 +}
 +  desktop.files += ../../../data/other/$${TARGET}.desktop
 +  icon64.files += ../../../data/icons/64x64/$${TARGET}.png
+ unix { 
+     # VARIABLES
+     isEmpty(PREFIX):PREFIX = /usr
+     BINDIR = $$PREFIX/bin
+     DATADIR = $$PREFIX/share
+     DEFINES += DATADIR=\\\"$$DATADIR\\\" \
+         PKGDATADIR=\\\"$$PKGDATADIR\\\"
+     
+     # MAKE INSTALL
+     INSTALLS += target \
+         desktop \
+         icon64 \
+         configs
+     configs.path = ~/.mdictionary
+     configs.files += ../../../data/mdictionary.defaults
+     target.path = $$BINDIR
+     maemo5 { 
+         desktop.path = $$DATADIR/applications/hildon
+         icon64.path = $$DATADIR/icons/hicolor/64x64/hildon
+     }
+     !maemo5 { 
+         desktop.path = $$DATADIR/applications
+         icon64.path = $$DATADIR/icons
+     }
+     desktop.files += ../../../data/other/$${TARGET}.desktop
+     icon64.files += ../../../data/icons/64x64/$${TARGET}.png
  }
- 
- RESOURCES += \
-     gui/gui.qrc
 -RESOURCES += gui/gui.qrc

diff --cc trunk/src/base/gui/MainWindow.cpp
index a13f93c,30b049b..c04dec4
--- 1/trunk/src/base/gui/MainWindow.cpp
--- 2/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@@ -100,18 -94,17 +100,23 @@@ void MainWindow::initializeUI() 
      settingsWidget = new SettingsWidget(this);
      settingsWidget->hide();
  
 +    bookmarksWidget = new BookmarksWidget(this);
 +    bookmarksWidget->hide();
 +
 +    menu = new QMenu(this);
++    
+     aboutWidget = new AboutWidget(this);
+     aboutWidget->hide();
+ 
+ 
+ 
      #ifdef Q_WS_MAEMO_5
          menuWidget = new MenuWidget(this);
          menuWidget->addSubMenu(tr("Settings"), settingsWidget);
          menuWidget->addSubMenu(tr("Dictionaries"), dictManagerWidget);
 +        menuWidget->addSubMenu(tr("Bookmarks"), bookmarksWidget);
-         menuWidget->addSubMenu(tr("About"), new QPushButton("About"));
-         menu->addAction(menuWidget);
-         ui->menuBar->addMenu(menu);
+         menuWidget->addSubMenu(tr("About"), aboutWidget);
+         ui->menuBar->addAction(menuWidget);
      #else
          dictionariesAction = ui->menuBar->addAction(tr("Dictionaries"));
          connect(dictionariesAction, SIGNAL(triggered()),
@@@ -121,9 -114,9 +126,13 @@@
          connect(settingsAction, SIGNAL(triggered()),
                  settingsWidget, SLOT(show()));
  
 -        aboutAction = ui->menuBar->addAction(tr("About"));
 +        bookmarksAction = ui->menuBar->addAction(tr("Bookmarks"));
 +        connect(bookmarksAction, SIGNAL(triggered()),
 +                bookmarksWidget, SLOT(show()));
++        
++      aboutAction = ui->menuBar->addAction(tr("About"));
+         connect(aboutAction, SIGNAL(triggered()),
+                 aboutWidget, SLOT(show()));
      #endif
  
  }

diff --cc trunk/src/base/gui/MainWindow.h
index 879b4f3,5f0c987..449ac13
--- 1/trunk/src/base/gui/MainWindow.h
--- 2/trunk/src/base/gui/MainWindow.h
+++ b/trunk/src/base/gui/MainWindow.h
@@@ -36,8 -36,7 +36,9 @@@
  #include "DictManagerWidget.h"
  #include "SettingsWidget.h"
  #include "HistoryListDialog.h"
 +#include "BookmarksWidget.h"
 +#include "WelcomeScreenWidget.h"
+ #include "AboutWidget.h"
  
  namespace Ui {
      class MainWindow;
@@@ -191,21 -187,19 +192,22 @@@ private
  
  
      SearchBarWidget* searchBarWidget;
 -    TranslationWidget* translationWidget;
 -    WordListWidget* wordListWidget;
 +    QWidget* translationWidget;
 +    QWidget* wordListWidget;
      MenuWidget* menuWidget;
 +    QMenu* menu;
      DictManagerWidget* dictManagerWidget;
      SettingsWidget* settingsWidget;
 +    BookmarksWidget* bookmarksWidget;
 +    QWidget* welcomeScreenWidget;
+     AboutWidget* aboutWidget;
  
      #ifndef Q_WS_MAEMO_5
          QSplitter* splitter;
          QAction* dictionariesAction;
 -        //QAction* edit;
 +        QAction* bookmarksAction;
          QAction* settingsAction;
-         //QAction* aboutAction;
+         QAction* aboutAction;
      #endif
  
      bool _exactSearch;