projects
/
mdictionary
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f7506b
)
Fixed problem with connects in DictManagerWidget.cpp. Fixed: remove warnings from...
author
Marcin Kaźmierczak
<marcin@marcin-desktop.(none)>
Thu, 30 Dec 2010 08:22:44 +0000
(09:22 +0100)
committer
Marcin Kaźmierczak
<marcin@marcin-desktop.(none)>
Thu, 30 Dec 2010 08:22:44 +0000
(09:22 +0100)
mdictionary.pri
patch
|
blob
|
history
src/mdictionary/gui/DictManagerWidget.cpp
patch
|
blob
|
history
src/mdictionary/gui/DictTypeSelectDialog.cpp
patch
|
blob
|
history
src/mdictionary/qml/DictManagerWidget.qml
patch
|
blob
|
history
diff --git
a/mdictionary.pri
b/mdictionary.pri
index
8e319e9
..
5b4b2ea
100644
(file)
--- a/
mdictionary.pri
+++ b/
mdictionary.pri
@@
-5,7
+5,8
@@
CONFIG += \
qt \
release
qt \
release
-CONFIG -= debug
+#CONFIG -= debug
+CONFIG += debug
isEmpty(ENABLED_SRC):ENABLED_SRC = "mdictionary plugins desktopWidget"
isEmpty(ENABLED_PLUGINS):ENABLED_PLUGINS = "xdxf google stardict"
isEmpty(ENABLED_SRC):ENABLED_SRC = "mdictionary plugins desktopWidget"
isEmpty(ENABLED_PLUGINS):ENABLED_PLUGINS = "xdxf google stardict"
diff --git
a/src/mdictionary/gui/DictManagerWidget.cpp
b/src/mdictionary/gui/DictManagerWidget.cpp
index
62d971c
..
e300a26
100644
(file)
--- a/
src/mdictionary/gui/DictManagerWidget.cpp
+++ b/
src/mdictionary/gui/DictManagerWidget.cpp
@@
-50,20
+50,18
@@
void DictManagerWidget::initalizeUI() {
#ifndef Q_WS_MAEMO_5
qmlView = new QDeclarativeView(this);
#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));
ctxt = qmlView->rootContext();
refreshDictsList();
ctxt->setContextProperty("dictModel", &(*model));
+ qmlView->setSource(QUrl::fromLocalFile("/usr/share/mdictionary/qml/DictManagerWidget.qml"));
QGraphicsObject *rootObject = qmlView->rootObject();
QGraphicsObject *rootObject = qmlView->rootObject();
- //connect(rootObject, SIGNAL(selectedRow(int)),
- // this, SLOT(pluginSelected(int)));
qmlView->setResizeMode(QDeclarativeView::SizeRootObjectToView);
verticalLayout->addWidget(qmlView);
qmlView->setResizeMode(QDeclarativeView::SizeRootObjectToView);
verticalLayout->addWidget(qmlView);
- //connecty zwrotne
#endif
#ifdef Q_WS_MAEMO_5
#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)),
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()));
// connect(dictList, SIGNAL(itemActivated(QListWidgetItem*)),
// this, SLOT(saveChanges()));
diff --git
a/src/mdictionary/gui/DictTypeSelectDialog.cpp
b/src/mdictionary/gui/DictTypeSelectDialog.cpp
index
8e26c14
..
4ab853b
100644
(file)
--- a/
src/mdictionary/gui/DictTypeSelectDialog.cpp
+++ b/
src/mdictionary/gui/DictTypeSelectDialog.cpp
@@
-39,11
+39,12
@@
DictTypeSelectDialog::DictTypeSelectDialog(QList<CommonDictInterface *> plugins,
#ifndef Q_WS_MAEMO_5
qmlView = new QDeclarativeView(this);
#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);
ctxt = qmlView->rootContext();
// model = new DictTypeModel(plugins, this);
ctxt->setContextProperty("dictTypeModel", &model);
+ qmlView->setSource(QUrl::fromLocalFile("/usr/share/mdictionary/qml/DictTypeSelectDialog.qml"));
_selectedPlugin = 0;
_selectedPlugin = 0;
diff --git
a/src/mdictionary/qml/DictManagerWidget.qml
b/src/mdictionary/qml/DictManagerWidget.qml
index
db75cde
..
ace01c9
100644
(file)
--- a/
src/mdictionary/qml/DictManagerWidget.qml
+++ b/
src/mdictionary/qml/DictManagerWidget.qml
@@
-112,7
+112,6
@@
Rectangle {
var aspectRatio = sourceSize.height / sourceSize.width
return logo.width * aspectRatio
}
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
anchors.leftMargin: 5
anchors.verticalCenter: parent.verticalCenter
width: nameText.height + 4
@@
-121,7
+120,6
@@
Rectangle {
Text {
id: nameText
text: name
Text {
id: nameText
text: name
- anchors.left: logo.right
anchors.leftMargin: 5
anchors.verticalCenter: parent.verticalCenter
}
anchors.leftMargin: 5
anchors.verticalCenter: parent.verticalCenter
}