Fixed problem with connects in DictManagerWidget.cpp. Fixed: remove warnings from...
authorMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Thu, 30 Dec 2010 08:22:44 +0000 (09:22 +0100)
committerMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Thu, 30 Dec 2010 08:22:44 +0000 (09:22 +0100)
mdictionary.pri
src/mdictionary/gui/DictManagerWidget.cpp
src/mdictionary/gui/DictTypeSelectDialog.cpp
src/mdictionary/qml/DictManagerWidget.qml

index 8e319e9..5b4b2ea 100644 (file)
@@ -5,7 +5,8 @@ CONFIG += \
        qt \
     release
 
-CONFIG -= debug
+#CONFIG -= debug
+CONFIG += debug
 
 isEmpty(ENABLED_SRC):ENABLED_SRC = "mdictionary plugins desktopWidget"
 isEmpty(ENABLED_PLUGINS):ENABLED_PLUGINS = "xdxf google stardict"
index 62d971c..e300a26 100644 (file)
@@ -50,20 +50,18 @@ void DictManagerWidget::initalizeUI() {
 
     #ifndef Q_WS_MAEMO_5
     qmlView = new QDeclarativeView(this);
-    qmlView->setSource(QUrl::fromLocalFile("/usr/share/mdictionary/qml/DictManagerWidget.qml"));
+
     ctxt = qmlView->rootContext();
 
     refreshDictsList();
     ctxt->setContextProperty("dictModel", &(*model));
+    qmlView->setSource(QUrl::fromLocalFile("/usr/share/mdictionary/qml/DictManagerWidget.qml"));
 
     QGraphicsObject *rootObject = qmlView->rootObject();
-    //connect(rootObject, SIGNAL(selectedRow(int)),
-    //        this, SLOT(pluginSelected(int)));
 
     qmlView->setResizeMode(QDeclarativeView::SizeRootObjectToView);
     verticalLayout->addWidget(qmlView);
 
-    //connecty zwrotne
     #endif
 
     #ifdef Q_WS_MAEMO_5
@@ -137,7 +135,7 @@ void DictManagerWidget::initalizeUI() {
             connect(rootObject, SIGNAL(itemActivated(int)),
                     this, SLOT(saveChanges()));
             connect(rootObject, SIGNAL(itemActivated(int)),
-                    settingsButton, SIGNAL(clicked()));
+                    this, SLOT(settingsButtonClicked()));
 
 //        connect(dictList, SIGNAL(itemActivated(QListWidgetItem*)),
 //                this, SLOT(saveChanges()));
index 8e26c14..4ab853b 100644 (file)
@@ -39,11 +39,12 @@ DictTypeSelectDialog::DictTypeSelectDialog(QList<CommonDictInterface *> plugins,
 
 #ifndef Q_WS_MAEMO_5
     qmlView = new QDeclarativeView(this);
-    qmlView->setSource(QUrl::fromLocalFile("/usr/share/mdictionary/qml/DictTypeSelectDialog.qml"));
+
     ctxt = qmlView->rootContext();
 
 //    model = new DictTypeModel(plugins, this);
     ctxt->setContextProperty("dictTypeModel", &model);
+    qmlView->setSource(QUrl::fromLocalFile("/usr/share/mdictionary/qml/DictTypeSelectDialog.qml"));
 
     _selectedPlugin = 0;
 
index db75cde..ace01c9 100644 (file)
@@ -112,7 +112,6 @@ Rectangle {
                             var aspectRatio = sourceSize.height / sourceSize.width
                             return logo.width * aspectRatio
                         }
-                        anchors.left: checkbox.right
                         anchors.leftMargin: 5
                         anchors.verticalCenter: parent.verticalCenter
                         width: nameText.height + 4
@@ -121,7 +120,6 @@ Rectangle {
                     Text {
                         id: nameText
                         text: name
-                        anchors.left: logo.right
                         anchors.leftMargin: 5
                         anchors.verticalCenter: parent.verticalCenter
                     }