projects
/
mdictionary
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eae5272
)
Disabled horizontal scroll bar in about widget
author
Mateusz Półrola
<mateusz.polrola@comarch.pl>
Fri, 20 Aug 2010 11:15:41 +0000
(13:15 +0200)
committer
Mateusz Półrola
<mateusz.polrola@comarch.pl>
Fri, 20 Aug 2010 11:15:41 +0000
(13:15 +0200)
data/icons/16x16/staroff.png
patch
|
blob
|
history
data/icons/16x16/staron.png
patch
|
blob
|
history
trunk/src/base/gui/AboutWidget.cpp
patch
|
blob
|
history
trunk/src/base/gui/TranslationWidget.cpp
patch
|
blob
|
history
diff --git
a/data/icons/16x16/staroff.png
b/data/icons/16x16/staroff.png
index
f5bcd45
..
23ce5dd
100644
(file)
Binary files a/data/icons/16x16/staroff.png and b/data/icons/16x16/staroff.png differ
diff --git
a/data/icons/16x16/staron.png
b/data/icons/16x16/staron.png
index
b335977
..
1cec111
100644
(file)
Binary files a/data/icons/16x16/staron.png and b/data/icons/16x16/staron.png differ
diff --git
a/trunk/src/base/gui/AboutWidget.cpp
b/trunk/src/base/gui/AboutWidget.cpp
index
d2edb32
..
333436c
100644
(file)
--- a/
trunk/src/base/gui/AboutWidget.cpp
+++ b/
trunk/src/base/gui/AboutWidget.cpp
@@
-60,9
+60,10
@@
AboutWidget::AboutWidget(GUIInterface *parent): QDialog(parent)
#ifndef Q_WS_MAEMO_5
w->setLayout(mainLayout);
scroll->setWidget(w);
#ifndef Q_WS_MAEMO_5
w->setLayout(mainLayout);
scroll->setWidget(w);
+ scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
scrollLayout->addWidget(scroll, 0, Qt::AlignHCenter);
this->setLayout(scrollLayout);
scrollLayout->addWidget(scroll, 0, Qt::AlignHCenter);
this->setLayout(scrollLayout);
- this->resize(img.width()*1.65, img.height()*2.60);
+ scroll->setMinimumSize(img.width()*1.65, img.height()*2.60);
#else
setLayout(mainLayout);
#endif
#else
setLayout(mainLayout);
#endif
diff --git
a/trunk/src/base/gui/TranslationWidget.cpp
b/trunk/src/base/gui/TranslationWidget.cpp
index
1bcbf1e
..
79f38e9
100644
(file)
--- a/
trunk/src/base/gui/TranslationWidget.cpp
+++ b/
trunk/src/base/gui/TranslationWidget.cpp
@@
-55,6
+55,7
@@
void TranslationWidget::show() {
void TranslationWidget::show(QStringList translations) {
void TranslationWidget::show(QStringList translations) {
+ textEdit->clear();
showMaximized();
showMaximized();
@@
-62,8
+63,8
@@
void TranslationWidget::show(QStringList translations) {
if(!buttonsInitialized)
initButtons();
#endif
if(!buttonsInitialized)
initButtons();
#endif
-
- textEdit->clear();
+ textEdit->repaint(this->rect());
+ update(this->rect());
QString trans;
QString t;
QString trans;
QString t;
@@
-73,6
+74,7
@@
void TranslationWidget::show(QStringList translations) {
// qDebug()<<trans;
// qDebug()<<trans;
+
trans=tr("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + tr("\n <ar>") + trans + tr("\n </ar>");
trans=XslConversion(trans);
textEdit->insertHtml(trans);
trans=tr("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + tr("\n <ar>") + trans + tr("\n </ar>");
trans=XslConversion(trans);
textEdit->insertHtml(trans);
@@
-80,6
+82,8
@@
void TranslationWidget::show(QStringList translations) {
textEdit->repaint(this->rect());
textEdit->repaint(this->rect());
+
+
update(this->rect());
emit updateSize();
update(this->rect());
emit updateSize();