diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2013-11-18 00:09:55 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2013-11-18 00:09:55 +0100 |
| commit | 82a87a7a41f1960cf6ffdc8cf1b172691638f15f (patch) | |
| tree | d77ac61357473a65ec59a73151cfbbd2586f0af9 | |
| parent | Get sure webkit objects are deleted in the app d-tor (diff) | |
| download | rekonq-82a87a7a41f1960cf6ffdc8cf1b172691638f15f.tar.xz | |
Adopt a new loading icon. It seems fixing some problems :)
| -rw-r--r-- | src/data/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/data/loading.gif | bin | 0 -> 847 bytes | |||
| -rw-r--r-- | src/data/loading.mng | bin | 3332 -> 0 bytes | |||
| -rw-r--r-- | src/tabwindow/tabwidget.cpp | 10 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt index ea7d05c7..1b6f2ca8 100644 --- a/src/data/CMakeLists.txt +++ b/src/data/CMakeLists.txt @@ -6,7 +6,7 @@ INSTALL( category.png button.png busywidget.gif - loading.mng + loading.gif webkit-icon.png autoscroll.png background.png diff --git a/src/data/loading.gif b/src/data/loading.gif Binary files differnew file mode 100644 index 00000000..c1545eb0 --- /dev/null +++ b/src/data/loading.gif diff --git a/src/data/loading.mng b/src/data/loading.mng Binary files differdeleted file mode 100644 index 0e490c4b..00000000 --- a/src/data/loading.mng +++ /dev/null diff --git a/src/tabwindow/tabwidget.cpp b/src/tabwindow/tabwidget.cpp index 0942e216..a322e2fe 100644 --- a/src/tabwindow/tabwidget.cpp +++ b/src/tabwindow/tabwidget.cpp @@ -547,7 +547,7 @@ void TabWidget::tabLoadStarted() if (!label->movie()) { - static QString loadingGitPath = KStandardDirs::locate("appdata" , "pics/loading.mng"); + static QString loadingGitPath = KStandardDirs::locate("appdata" , "pics/loading.gif"); QMovie *movie = new QMovie(loadingGitPath, QByteArray(), label); movie->setSpeed(50); @@ -559,7 +559,9 @@ void TabWidget::tabLoadStarted() tabBar()->setTabButton(index, QTabBar::LeftSide, label); if (!tabBar()->tabData(index).toBool()) + { tabBar()->setTabText(index, i18n("Loading...")); + } else { tabBar()->tabButton(index, QTabBar::RightSide)->hide(); // NOTE: not really good this, but..."Repetita iuvant"!!! @@ -910,8 +912,9 @@ int TabWidget::addTab(QWidget *page, const QIcon &icon, const QString &label) int TabWidget::insertTab(int index, QWidget *page, const QString &label) { - if (! ReKonfig::openNewTabsNextToCurrent()) + if (!ReKonfig::openNewTabsNextToCurrent()) index = -1; + setUpdatesEnabled(false); int i = KTabWidget::insertTab(index, page, label); setUpdatesEnabled(true); @@ -922,8 +925,9 @@ int TabWidget::insertTab(int index, QWidget *page, const QString &label) int TabWidget::insertTab(int index, QWidget *page, const QIcon &icon, const QString &label) { - if (! ReKonfig::openNewTabsNextToCurrent()) + if (!ReKonfig::openNewTabsNextToCurrent()) index = -1; + setUpdatesEnabled(false); int i = KTabWidget::insertTab(index, page, icon, label); setUpdatesEnabled(true); |
