web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build 32bit QT; refs #22

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-01-27 12:06:46 +00:00
parent 92612cb68a
commit aea99e5fd4
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qt/makefile
View File

@@ -13,7 +13,7 @@ ${QT}: ${QT}.tar.gz
cd $@ && patch -p1 < ../patch/qt-sources-patch.diff cd $@ && patch -p1 < ../patch/qt-sources-patch.diff
build: ${QT} build: ${QT}
cd $< && (echo "yes" | ./configure -opensource -prefix=/usr/local/trolltech/qt) cd $< && (echo "yes" | ./configure -opensource -prefix /usr/local/trolltech/qt)
cd $< && make cd $< && make
install-lin32: install-lin32:
@@ -23,7 +23,7 @@ ${QT}-lin32: ${QT}
cp -a $< $@ cp -a $< $@
build-lin32: ${QT}-lin32 build-lin32: ${QT}-lin32
cd $< && (echo "yes" | ./configure -opensource -platform linux-g++-32 -prefix=/usr/local/trolltech/qt-32bit) cd $< && (echo "yes" | ./configure -opensource -platform linux-g++-32 -prefix /usr/local/trolltech/qt-32bit)
cd $< && make cd $< && make
.PHONY: maintainer-clean all build install build-lin32 install-lin32 .PHONY: maintainer-clean all build install build-lin32 install-lin32

22
swisssurfer/src/browser.hxx
View File

@@ -105,13 +105,10 @@ class Browser: public QMainWindow, protected Ui::Browser {
assert(connect(_addBookmark, SIGNAL(clicked(bool)), assert(connect(_addBookmark, SIGNAL(clicked(bool)),
SLOT(addBookmark()))); SLOT(addBookmark())));
} }
if (!_kiosk && _settings.flag("SaveWindowState") && _settings()) { if (!_kiosk && _settings.flag("SaveWindowState") && _settings())
loadWin(); loadWin(urls.size());
for (int i(0); i<urls.size(); ++i) load(urls.at(i), newTab()); if (urls.size()) load(urls.at(0));
} else { for (int i(1); i<urls.size(); ++i) load(urls.at(i), newTab());
if (urls.size()) load(urls.at(0));
for (int i(1); i<urls.size(); ++i) load(urls.at(i), newTab());
}
} }
~Browser() { ~Browser() {
@@ -369,7 +366,9 @@ class Browser: public QMainWindow, protected Ui::Browser {
->selectedText()); ->selectedText());
} }
disconnect(_find, SIGNAL(returnPressed()), this, SLOT(rfind())); disconnect(_find, SIGNAL(returnPressed()), this, SLOT(rfind()));
disconnect(_find, SIGNAL(textEdited(QString)), this, SLOT(rfind()));
assert(connect(_find, SIGNAL(returnPressed()), SLOT(find()))); assert(connect(_find, SIGNAL(returnPressed()), SLOT(find())));
assert(connect(_find, SIGNAL(textEdited(QString)), SLOT(find())));
_find->setFocus(); _find->setFocus();
} }
@@ -380,7 +379,9 @@ class Browser: public QMainWindow, protected Ui::Browser {
->selectedText()); ->selectedText());
} }
disconnect(_find, SIGNAL(returnPressed()), this, SLOT(find())); disconnect(_find, SIGNAL(returnPressed()), this, SLOT(find()));
disconnect(_find, SIGNAL(textEdited(QString)), this, SLOT(find()));
assert(connect(_find, SIGNAL(returnPressed()), SLOT(rfind()))); assert(connect(_find, SIGNAL(returnPressed()), SLOT(rfind())));
assert(connect(_find, SIGNAL(textEdited(QString)), SLOT(rfind())));
_find->setFocus(); _find->setFocus();
} }
@@ -921,14 +922,15 @@ class Browser: public QMainWindow, protected Ui::Browser {
_settings()->setValue("Window/WindowState", saveState()); _settings()->setValue("Window/WindowState", saveState());
} }
void loadWin() { void loadWin(bool noRrestoreTabs=true) {
QStringList urls(_settings()->value("Window/Urls").toStringList()); QStringList urls(_settings()->value("Window/Urls").toStringList());
urls.sort(); urls.sort();
urls.removeDuplicates(); urls.removeDuplicates();
_url->addItems(urls); _url->addItems(urls);
QStringList tabs(_settings()->value("Window/Tabs").toStringList()); QStringList tabs(_settings()->value("Window/Tabs").toStringList());
for (QStringList::iterator it(tabs.begin()); it!=tabs.end(); ++it) if (!noRrestoreTabs)
load(*it, newTab()); for (QStringList::iterator it(tabs.begin()); it!=tabs.end(); ++it)
load(*it, newTab());
if (_tabs->count()>1) _tabs->removeTab(0); if (_tabs->count()>1) _tabs->removeTab(0);
_tabs->setTabsClosable(_tabs->count()>1); _tabs->setTabsClosable(_tabs->count()>1);
_tabs->setCurrentIndex(_settings()->value("Window/CurrentTab").toInt()); _tabs->setCurrentIndex(_settings()->value("Window/CurrentTab").toInt());