Qt 4.6

diff --git a/debian/changelog b/debian/changelog
index 381ab10..d684bec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 qstardict (0.13.2-3) unstable; urgency=low
 
 qstardict (0.13.2-3) unstable; urgency=low
 

+  * Qt 4.6
+
+ -- SR <sbir@list.ru>  Fri, 5 Mar 2010 19:30:00 +0300
+
+qstardict (0.13.2-3) unstable; urgency=low
+

   * Some bugs fixed
 
  -- SR <sbir@list.ru>  Sun, 31 Jan 2010 19:50:00 +0300
   * Some bugs fixed
 
  -- SR <sbir@list.ru>  Sun, 31 Jan 2010 19:50:00 +0300

diff --git a/debian/control b/debian/control
index 38d562c..1b9e86a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: qstardict
 Source: qstardict

-Version: 0.13.2-3
+Version: 0.13.2-4

 Section: user/office
 Priority: optional
 Maintainer: Alexander R <sbir@list.ru>
 Section: user/office
 Priority: optional
 Maintainer: Alexander R <sbir@list.ru>

-Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.4.0), libglib2.0-dev, zlib1g-dev, libx11-dev, debhelper-maemo-package-icons (>= 0.0.2), maemo-optify | maemo-version (< 5.0)
+Build-Depends: debhelper (>= 5), libqt4-maemo5-dev (>= 4.6.0), libglib2.0-dev, zlib1g-dev, libx11-dev, debhelper-maemo-package-icons (>= 0.0.2), maemo-optify | maemo-version (< 5.0)

 Standards-Version: 3.8.0
 
 Package: qstardict
 Standards-Version: 3.8.0
 
 Package: qstardict

diff --git a/debian/rules b/debian/rules
index d6100a8..3c22294 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ endif
 configure: configure-stamp
 configure-stamp:
        dh_testdir
 configure: configure-stamp
 configure-stamp:
        dh_testdir

-       qmake-qt4
+       /opt/qt4-maemo5/bin/qmake-qt4

        touch configure-stamp
 
 build: build-stamp
        touch configure-stamp
 
 build: build-stamp

diff --git a/qstardict/mainwindow.cpp b/qstardict/mainwindow.cpp
index ceeb3e0..cdc3eb1 100644 (file)
--- a/qstardict/mainwindow.cpp
+++ b/qstardict/mainwindow.cpp
@@ -52,10 +52,10 @@ MainWindow::MainWindow(QWidget *parent)
     QFont font;
     font.setPointSize(16);
 
     QFont font;
     font.setPointSize(16);
 

-    menu->insertActions(actionQuit, translationView->toolBar()->actions());
+    menu_File->insertActions(actionQuit, translationView->toolBar()->actions());

 
     QAction *actionWordsListDock = wordsListDock->toggleViewAction();
 
     QAction *actionWordsListDock = wordsListDock->toggleViewAction();

-    menu->insertAction(menu->actions().first(), actionWordsListDock);
+    menu_Options->insertAction(menu_Options->actions().first(), actionWordsListDock);

     actionWordsListDock->setFont(font);
     //wordsList->setProperty("FingerScrollable", true);
     //translationView->setProperty("FingerScrollable", true);
     actionWordsListDock->setFont(font);
     //wordsList->setProperty("FingerScrollable", true);
     //translationView->setProperty("FingerScrollable", true);

diff --git a/qstardict/mainwindow.ui b/qstardict/mainwindow.ui
index 0f5264b..8f55516 100644 (file)
--- a/qstardict/mainwindow.ui
+++ b/qstardict/mainwindow.ui
@@ -144,21 +144,30 @@
      <pointsize>16</pointsize>
     </font>
    </property>
      <pointsize>16</pointsize>
     </font>
    </property>

-   <widget class="QMenu" name="menu">
-    <property name="acceptDrops">
-     <bool>true</bool>
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
+     <string>&amp;File</string>

     </property>
     </property>

+    <addaction name="actionQuit"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">

     <property name="title">
     <property name="title">

-     <string>Menu</string>
+     <string>&amp;Help</string>

     </property>
     </property>

-    <addaction name="actionSettings"/>
-    <addaction name="actionScan"/>

     <addaction name="actionHelp"/>
     <addaction name="actionAbout"/>
     <addaction name="actionAboutQt"/>
     <addaction name="actionHelp"/>
     <addaction name="actionAbout"/>
     <addaction name="actionAboutQt"/>

-    <addaction name="actionQuit"/>

    </widget>
    </widget>

-   <addaction name="menu"/>
+   <widget class="QMenu" name="menu_Options">
+    <property name="title">
+     <string>&amp;Settings</string>
+    </property>
+    <addaction name="actionScan"/>
+    <addaction name="actionSettings"/>
+   </widget>
+   <addaction name="menu_File"/>
+   <addaction name="menu_Options"/>
+   <addaction name="menuHelp"/>

   </widget>
   <widget class="QDockWidget" name="wordsListDock">
    <property name="features">
   </widget>
   <widget class="QDockWidget" name="wordsListDock">
    <property name="features">