From 3a3e7341a2e99cbbbc02572d2bbdf620392d8356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mladen=20Pejakovi=C4=87?= Date: Sat, 4 Jan 2014 22:37:18 +0100 Subject: [PATCH] Thematic changes --- src/lib/app/qupzilla.cpp | 4 +- src/lib/bookmarks/bookmarksmanager.cpp | 2 +- src/lib/bookmarks/bookmarkstree.cpp | 2 +- src/lib/bookmarks/bookmarkswidget.cpp | 21 ++- src/lib/bookmarks/bookmarkswidget.ui | 123 +++++------------- .../bookmarksimport/bookmarksimportdialog.ui | 2 +- src/lib/data/html.qrc | 4 +- src/lib/data/html/configure.png | Bin 0 -> 1374 bytes src/lib/data/html/copyright | 8 +- src/lib/data/html/hdd-icon.png | Bin 703 -> 0 bytes src/lib/data/html/info.png | Bin 2517 -> 0 bytes src/lib/data/html/plus.png | Bin 945 -> 774 bytes src/lib/data/html/setting.png | Bin 1151 -> 0 bytes src/lib/data/html/speeddial.html | 21 ++- src/lib/data/icons.qrc | 41 +++--- src/lib/data/icons/faenza/back.png | Bin 533 -> 0 bytes src/lib/data/icons/faenza/close.png | Bin 693 -> 0 bytes src/lib/data/icons/faenza/collapse.png | Bin 631 -> 0 bytes src/lib/data/icons/faenza/expand.png | Bin 640 -> 0 bytes src/lib/data/icons/faenza/forward.png | Bin 546 -> 0 bytes src/lib/data/icons/faenza/go-next.png | Bin 318 -> 0 bytes src/lib/data/icons/faenza/go-previous.png | Bin 332 -> 0 bytes src/lib/data/icons/faenza/go-up.png | Bin 452 -> 0 bytes src/lib/data/icons/faenza/home.png | Bin 562 -> 0 bytes src/lib/data/icons/faenza/list-remove.png | Bin 463 -> 0 bytes src/lib/data/icons/faenza/reload.png | Bin 773 -> 0 bytes src/lib/data/icons/faenza/settings.png | Bin 516 -> 0 bytes src/lib/data/icons/faenza/stop.png | Bin 1160 -> 0 bytes src/lib/data/icons/faenza/user-bookmarks.png | Bin 596 -> 0 bytes src/lib/data/icons/locationbar/accept.png | Bin 1202 -> 0 bytes .../icons/locationbar/privatebrowsing.png | Bin 963 -> 409 bytes src/lib/data/icons/locationbar/safe.png | Bin 0 -> 877 bytes .../data/icons/locationbar/unknownpage.png | Bin 398 -> 530 bytes src/lib/data/icons/locationbar/unsafe.png | Bin 0 -> 1003 bytes src/lib/data/icons/locationbar/visit1.png | Bin 0 -> 962 bytes src/lib/data/icons/locationbar/visit2.png | Bin 0 -> 1419 bytes src/lib/data/icons/locationbar/visit3.png | Bin 0 -> 1237 bytes src/lib/data/icons/locationbar/warning.png | Bin 1396 -> 0 bytes src/lib/data/icons/menu/new-tab.png | Bin 456 -> 0 bytes src/lib/data/icons/menu/tab-new.png | Bin 0 -> 520 bytes src/lib/data/icons/menu/tab.png | Bin 323 -> 441 bytes src/lib/data/icons/notifications/download.png | Bin 1918 -> 4482 bytes src/lib/data/icons/other/bigrss.png | Bin 1877 -> 0 bytes src/lib/data/icons/other/bigstar.png | Bin 1618 -> 1769 bytes src/lib/data/icons/other/feed.png | Bin 706 -> 1136 bytes src/lib/data/icons/other/notification.png | Bin 1442 -> 1150 bytes .../data/icons/other/unsortedbookmarks.png | Bin 481 -> 0 bytes .../icons/preferences/application-x-theme.png | Bin 1562 -> 1703 bytes .../icons/preferences/applications-fonts.png | Bin 1175 -> 1778 bytes .../preferences/applications-graphics.png | Bin 2199 -> 2792 bytes .../preferences/applications-internet.png | Bin 1957 -> 1143 bytes .../icons/preferences/applications-system.png | Bin 1093 -> 1836 bytes .../preferences/applications-webbrowsers.png | Bin 2357 -> 2685 bytes .../icons/preferences/dialog-password.png | Bin 1213 -> 1356 bytes .../icons/preferences/dialog-question.png | Bin 1829 -> 2050 bytes .../icons/preferences/document-properties.png | Bin 872 -> 1328 bytes src/lib/data/icons/preferences/extension.png | Bin 1067 -> 1763 bytes src/lib/data/icons/preferences/mail-inbox.png | Bin 1297 -> 2445 bytes ...preferences-desktop-keyboard-shortcuts.png | Bin 1471 -> 1826 bytes .../icons/preferences/preferences-desktop.png | Bin 1368 -> 2245 bytes .../data/icons/preferences/style-default.png | Bin 737 -> 1078 bytes src/lib/data/icons/preferences/text-x-sql.png | Bin 933 -> 1768 bytes src/lib/data/icons/theme/back.png | Bin 0 -> 907 bytes src/lib/data/icons/theme/close.png | Bin 0 -> 1251 bytes src/lib/data/icons/theme/collapse.png | Bin 0 -> 642 bytes src/lib/data/icons/theme/expand.png | Bin 0 -> 632 bytes src/lib/data/icons/theme/forward.png | Bin 0 -> 940 bytes src/lib/data/icons/theme/go-next.png | Bin 0 -> 721 bytes src/lib/data/icons/theme/go-previous.png | Bin 0 -> 634 bytes src/lib/data/icons/theme/go-up.png | Bin 0 -> 672 bytes src/lib/data/icons/theme/home.png | Bin 0 -> 935 bytes src/lib/data/icons/theme/list-remove.png | Bin 0 -> 332 bytes src/lib/data/icons/theme/reload.png | Bin 0 -> 1283 bytes src/lib/data/icons/theme/settings.png | Bin 0 -> 945 bytes src/lib/data/icons/theme/speeddial.png | Bin 0 -> 507 bytes src/lib/data/icons/theme/stop.png | Bin 0 -> 1078 bytes .../data/icons/theme/unsortedbookmarks.png | Bin 0 -> 332 bytes src/lib/data/icons/theme/user-bookmarks.png | Bin 0 -> 625 bytes .../schemehandlers/qupzillaschemehandler.cpp | 2 +- src/lib/other/browsinglibrary.cpp | 2 +- src/lib/rss/rsswidget.cpp | 11 +- src/lib/rss/rsswidget.ui | 18 +-- src/lib/sidebar/bookmarkssidebar.cpp | 4 +- src/lib/tools/iconprovider.cpp | 28 ++-- src/lib/webview/siteinfowidget.cpp | 10 +- src/lib/webview/tabbar.cpp | 2 +- src/lib/webview/webview.cpp | 107 ++++++++------- src/lib/webview/webview.h | 2 + 88 files changed, 187 insertions(+), 227 deletions(-) create mode 100644 src/lib/data/html/configure.png delete mode 100644 src/lib/data/html/hdd-icon.png delete mode 100644 src/lib/data/html/info.png delete mode 100644 src/lib/data/html/setting.png delete mode 100644 src/lib/data/icons/faenza/back.png delete mode 100644 src/lib/data/icons/faenza/close.png delete mode 100644 src/lib/data/icons/faenza/collapse.png delete mode 100644 src/lib/data/icons/faenza/expand.png delete mode 100644 src/lib/data/icons/faenza/forward.png delete mode 100644 src/lib/data/icons/faenza/go-next.png delete mode 100644 src/lib/data/icons/faenza/go-previous.png delete mode 100644 src/lib/data/icons/faenza/go-up.png delete mode 100644 src/lib/data/icons/faenza/home.png delete mode 100644 src/lib/data/icons/faenza/list-remove.png delete mode 100644 src/lib/data/icons/faenza/reload.png delete mode 100644 src/lib/data/icons/faenza/settings.png delete mode 100644 src/lib/data/icons/faenza/stop.png delete mode 100644 src/lib/data/icons/faenza/user-bookmarks.png delete mode 100644 src/lib/data/icons/locationbar/accept.png create mode 100644 src/lib/data/icons/locationbar/safe.png create mode 100644 src/lib/data/icons/locationbar/unsafe.png create mode 100644 src/lib/data/icons/locationbar/visit1.png create mode 100644 src/lib/data/icons/locationbar/visit2.png create mode 100644 src/lib/data/icons/locationbar/visit3.png delete mode 100644 src/lib/data/icons/locationbar/warning.png delete mode 100644 src/lib/data/icons/menu/new-tab.png create mode 100644 src/lib/data/icons/menu/tab-new.png delete mode 100644 src/lib/data/icons/other/bigrss.png delete mode 100644 src/lib/data/icons/other/unsortedbookmarks.png create mode 100644 src/lib/data/icons/theme/back.png create mode 100644 src/lib/data/icons/theme/close.png create mode 100644 src/lib/data/icons/theme/collapse.png create mode 100644 src/lib/data/icons/theme/expand.png create mode 100644 src/lib/data/icons/theme/forward.png create mode 100644 src/lib/data/icons/theme/go-next.png create mode 100644 src/lib/data/icons/theme/go-previous.png create mode 100644 src/lib/data/icons/theme/go-up.png create mode 100644 src/lib/data/icons/theme/home.png create mode 100644 src/lib/data/icons/theme/list-remove.png create mode 100644 src/lib/data/icons/theme/reload.png create mode 100644 src/lib/data/icons/theme/settings.png create mode 100644 src/lib/data/icons/theme/speeddial.png create mode 100644 src/lib/data/icons/theme/stop.png create mode 100644 src/lib/data/icons/theme/unsortedbookmarks.png create mode 100644 src/lib/data/icons/theme/user-bookmarks.png diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp index 7c0a72f96..a3bb58f3b 100644 --- a/src/lib/app/qupzilla.cpp +++ b/src/lib/app/qupzilla.cpp @@ -396,7 +396,7 @@ void QupZilla::setupMenu() m_actionAbout->setMenuRole(QAction::AboutRole); connect(m_actionAbout, SIGNAL(triggered()), MENU_RECEIVER, SLOT(aboutQupZilla())); - m_actionPreferences = new QAction(QIcon::fromTheme("preferences-desktop", QIcon(":/icons/faenza/settings.png")), tr("Pr&eferences"), 0); + m_actionPreferences = new QAction(QIcon::fromTheme("preferences-desktop", QIcon(":/icons/theme/settings.png")), tr("Pr&eferences"), 0); m_actionPreferences->setMenuRole(QAction::PreferencesRole); m_actionPreferences->setShortcut(QKeySequence(QKeySequence::Preferences)); connect(m_actionPreferences, SIGNAL(triggered()), MENU_RECEIVER, SLOT(showPreferences())); @@ -412,7 +412,7 @@ void QupZilla::setupMenu() * File Menu * *************/ m_menuFile = new QMenu(tr("&File")); - m_menuFile->addAction(QIcon::fromTheme("tab-new", QIcon(":/icons/menu/new-tab.png")), tr("New Tab"), MENU_RECEIVER, SLOT(addTab()))->setShortcut(QKeySequence("Ctrl+T")); + m_menuFile->addAction(QIcon::fromTheme("tab-new", QIcon(":/icons/menu/tab-new.png")), tr("New Tab"), MENU_RECEIVER, SLOT(addTab()))->setShortcut(QKeySequence("Ctrl+T")); m_menuFile->addAction(QIcon::fromTheme("window-new"), tr("&New Window"), MENU_RECEIVER, SLOT(newWindow()))->setShortcut(QKeySequence("Ctrl+N")); m_menuFile->addAction(QIcon::fromTheme("document-open-remote"), tr("Open Location"), MENU_RECEIVER, SLOT(openLocation()))->setShortcut(QKeySequence("Ctrl+L")); m_menuFile->addAction(QIcon::fromTheme("document-open"), tr("Open &File..."), MENU_RECEIVER, SLOT(openFile()))->setShortcut(QKeySequence("Ctrl+O")); diff --git a/src/lib/bookmarks/bookmarksmanager.cpp b/src/lib/bookmarks/bookmarksmanager.cpp index a17e5bdc3..952e23488 100644 --- a/src/lib/bookmarks/bookmarksmanager.cpp +++ b/src/lib/bookmarks/bookmarksmanager.cpp @@ -350,7 +350,7 @@ void BookmarksManager::contextMenuRequested(const QPoint &position) QMenu moveMenu; moveMenu.setTitle(tr("Move bookmark to &folder")); - moveMenu.addAction(QIcon(":icons/other/unsortedbookmarks.png"), _bookmarksUnsorted, this, SLOT(moveBookmark()))->setData("unsorted"); + moveMenu.addAction(QIcon(":icons/theme/unsortedbookmarks.png"), _bookmarksUnsorted, this, SLOT(moveBookmark()))->setData("unsorted"); moveMenu.addAction(style()->standardIcon(QStyle::SP_DirOpenIcon), _bookmarksMenu, this, SLOT(moveBookmark()))->setData("bookmarksMenu"); moveMenu.addAction(style()->standardIcon(QStyle::SP_DirOpenIcon), _bookmarksToolbar, this, SLOT(moveBookmark()))->setData("bookmarksToolbar"); QSqlQuery query; diff --git a/src/lib/bookmarks/bookmarkstree.cpp b/src/lib/bookmarks/bookmarkstree.cpp index 49d01c6e6..56cdc4c52 100644 --- a/src/lib/bookmarks/bookmarkstree.cpp +++ b/src/lib/bookmarks/bookmarkstree.cpp @@ -74,7 +74,7 @@ void BookmarksTree::refreshTree() QTreeWidgetItem* newItem = new QTreeWidgetItem(rootItem); newItem->setText(0, _bookmarksUnsorted); newItem->setData(0, Qt::UserRole, "unsorted"); - newItem->setIcon(0, QIcon(":/icons/other/unsortedbookmarks.png")); + newItem->setIcon(0, QIcon(":/icons/theme/unsortedbookmarks.png")); addTopLevelItem(newItem); } diff --git a/src/lib/bookmarks/bookmarkswidget.cpp b/src/lib/bookmarks/bookmarkswidget.cpp index 93ce9228d..08a32782e 100644 --- a/src/lib/bookmarks/bookmarkswidget.cpp +++ b/src/lib/bookmarks/bookmarkswidget.cpp @@ -54,9 +54,10 @@ BookmarksWidget::BookmarksWidget(WebView* view, QWidget* parent) // it dynamically changes and so, it's not good choice for this widget. setLayoutDirection(QApplication::layoutDirection()); - connect(ui->speeddialButton, SIGNAL(clicked(QPoint)), this, SLOT(toggleSpeedDial())); + connect(ui->speeddialButton, SIGNAL(clicked()), this, SLOT(toggleSpeedDial())); const SpeedDial::Page page = m_speedDial->pageForUrl(m_url); + ui->speeddialButton->setFlat(page.url.isEmpty() ? true : false); ui->speeddialButton->setText(page.url.isEmpty() ? tr("Add to Speed Dial") : tr("Remove from Speed Dial")); @@ -77,7 +78,6 @@ void BookmarksWidget::loadBookmark() if (m_bookmarkId > 0) { BookmarksModel::Bookmark bookmark = m_bookmarksModel->getBookmark(m_bookmarkId); - ui->name->setText(bookmark.title); int index = ui->folder->findData(bookmark.folder); // QComboBox::findData() returns index related to the item's parent @@ -93,16 +93,13 @@ void BookmarksWidget::loadBookmark() ui->folder->setCurrentIndex(index); } - ui->saveRemove->setText(tr("Remove")); - connect(ui->name, SIGNAL(textEdited(QString)), SLOT(bookmarkEdited())); + ui->saveRemove->setText("Remove from Bookmarks"); + ui->saveRemove->setFlat(false); connect(ui->folder, SIGNAL(currentIndexChanged(int)), SLOT(bookmarkEdited())); } else { - ui->name->setText(m_view->title()); ui->folder->setCurrentIndex(0); } - - ui->name->setCursorPosition(0); } void BookmarksWidget::toggleSpeedDial() @@ -110,7 +107,7 @@ void BookmarksWidget::toggleSpeedDial() const SpeedDial::Page page = m_speedDial->pageForUrl(m_url); if (page.url.isEmpty()) { - QString title = ui->name->text().isEmpty() ? m_view->title() : ui->name->text(); + QString title = m_view->title(); m_speedDial->addPage(m_url, title); } else { @@ -127,19 +124,19 @@ void BookmarksWidget::bookmarkEdited() } m_edited = true; - ui->saveRemove->setText(tr("Save")); + ui->saveRemove->setFlat(true); } void BookmarksWidget::comboItemActive(int index) { - m_bookmarksTree->activeItemChange(index, ui->folder, ui->name->text(), m_view); + m_bookmarksTree->activeItemChange(index, ui->folder, m_view->title(), m_view); } void BookmarksWidget::on_saveRemove_clicked(bool) { if (m_bookmarkId > 0) { if (m_edited) { - m_bookmarksModel->editBookmark(m_bookmarkId, ui->name->text(), QUrl(), BookmarksModel::fromTranslatedFolder(ui->folder->currentText())); + m_bookmarksModel->editBookmark(m_bookmarkId, m_view->title(), QUrl(), BookmarksModel::fromTranslatedFolder(ui->folder->currentText())); } else { m_bookmarksModel->removeBookmark(m_url); @@ -147,7 +144,7 @@ void BookmarksWidget::on_saveRemove_clicked(bool) } } else { - m_bookmarksModel->saveBookmark(m_url, ui->name->text(), m_view->icon(), BookmarksModel::fromTranslatedFolder(ui->folder->currentText())); + m_bookmarksModel->saveBookmark(m_url, m_view->title(), m_view->icon(), BookmarksModel::fromTranslatedFolder(ui->folder->currentText())); } QTimer::singleShot(HIDE_DELAY, this, SLOT(close())); diff --git a/src/lib/bookmarks/bookmarkswidget.ui b/src/lib/bookmarks/bookmarkswidget.ui index cfcc1dce8..0f9976bb7 100644 --- a/src/lib/bookmarks/bookmarkswidget.ui +++ b/src/lib/bookmarks/bookmarkswidget.ui @@ -2,114 +2,55 @@ BookmarksWidget - - - 0 - 0 - 210 - 135 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - PointingHandCursor - - - Add to Speed Dial - - - true - - - - - - - - - - - - - 0 - 0 - + + + + Qt::NoFocus + + + Add to Speed Dial + + + + :/icons/theme/speeddial.png:/icons/theme/speeddial.png + + + true - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Save - - - - - - + - Name: + Add to bookmarks + + + + :/icons/other/bigstar.png:/icons/other/bigstar.png + + + true - - - Folder: + + + + 0 + 0 + - - - ClickableLabel - QLabel -
clickablelabel.h
-
-
- + + +
diff --git a/src/lib/bookmarksimport/bookmarksimportdialog.ui b/src/lib/bookmarksimport/bookmarksimportdialog.ui index cbc5f6c76..5014817ce 100644 --- a/src/lib/bookmarksimport/bookmarksimportdialog.ui +++ b/src/lib/bookmarksimport/bookmarksimportdialog.ui @@ -291,7 +291,7 @@ - :/icons/faenza/stop.png:/icons/faenza/stop.png + :/icons/theme/stop.png:/icons/theme/stop.png diff --git a/src/lib/data/html.qrc b/src/lib/data/html.qrc index f4392374a..aa277b860 100644 --- a/src/lib/data/html.qrc +++ b/src/lib/data/html.qrc @@ -1,7 +1,6 @@ html/errorPage.html - html/info.png html/adblock_big.png html/adblockPage.html html/about.html @@ -20,10 +19,9 @@ html/reload.png html/qupzilla.ico html/broken-page.png - html/setting.png + html/configure.png html/config.html html/restore.html html/dirlist.html - html/hdd-icon.png diff --git a/src/lib/data/html/configure.png b/src/lib/data/html/configure.png new file mode 100644 index 0000000000000000000000000000000000000000..17ceb3274564ea54f943bdb801b39ff79e8e356a GIT binary patch literal 1374 zcmV-k1)=(hP)e`khWc3~G3x-~^zt)fJ0G23FisHU|c z5upif(zNkHFSsBvegI=a^aB{~^g_P?Hgch9S}{seZNx-FL`>F23I*w+va(@-*_YXw zIlb5&h1T7nRN8+s$;mVSbDrlsZ|58#rR4uanKKYVsDO8=Y>i+7hLq9*5K>Bn5aqzf zilQ6=Hm|V(Q?_ki2Odi)vt>dE0lcRuN}Fxlb--H3WK%)cb0NgE0;s?TK;0TEUW&Sc zPE{!g{QseH2Yvv>ja3B7xpU{5E?>U<`O%|CKm0dVlmP-zY}rF@a@|O9UUE! zuCA_qx~@CP!@$76s}mcIwEEbyu76CaoH9Q9-FopE=Na4&4q;p5Ae79K|z-Sc^9cbgAii-D&7bp9*=vI$)pU2!&Oqsa?>=$ z=;-KtXJ_Y4V1c)EL?HxH$}!;S(z8IkjqCy$jYdbJ(dcAtZS9v+Q&YO8Y1!G?*)*V0 zJOLej2%sEjS5>vyvaHo!$p!fmHGy0~RT&SFa#R-rfHgN?~$FQIt|= z_d7*FR|b$}k^)iCP^UtKi$q0@#QV_l z7sO)*DDXU<&2%y=`Mz6Kt!4KvJ)M8@^(6PK#NEfLSV62;G9E5@F8GkxS}AYLT!dpipCiEJ)3bppR?#X zRvVjb*I^qs+guEDUiugOxc;8c@#Ff$DWwa-?xUnl$6XiIc#k80!2P3Je2sh9!jS2w zPuBH4Ravs~p5A)|E{(7&;>r?HW!bhE;69w5KJB`01Y9goz_yOI%e|<#%LVGH3i9pO zugA0VGwOPezF#t|21JBvRKe!!^3FKD8;IiB^ZN{akE$xeYDL?%q?|yYsT+Lsh{#2% zDvP+_`PXNR4^H`#-l3|fh~P@cmB~H=q?A|=OGf1gRlOwANX?_>2{ymU!Sco$|2dmI l{`c0q^?&h{$Y!LJ_zOYW*p9CFBJ%(M002ovPDHLkV1jjRL&N|8 diff --git a/src/lib/data/html/info.png b/src/lib/data/html/info.png deleted file mode 100644 index 96b4d44ec08838c4668d02601a1de17f6e5e4ded..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2517 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 literal 945 zcmV;i15W&jP)Px#32;bRa{vGvuK)lWuK`{fksJU316D~yK~zY`-IYyfTvZgufA{0Pm+3TVT9aVg zfMCHAnjj5Hh)~KyyKs|*VnHkFLa?~9AP8<`&{az+Vw+h zqJiIPs|WI#v1C$-3*L0B&kWZ1UNf$wznV)oa;OXr}^H~T4*WJQYMM9eMy=UHbSHj z#BPkm_6>gCJ?&|&9j(w3yUb72_Uvb(_*u`9-AAvi0nGh5_ui?;Pf-zNj>b<9N+}V- zf&eK5SvO;YFc1Kq^6c^6*Rx8fVJRe9Dz-UUw(IRQ2>9yO*gL>8YXGB{Mu!h{^l+nc zg<@DlYK2multc^3Twp}Qgh&C?E0aPC1xQ+*c8pQ{vUH6b#YJ8m8eu6YJh|bDf+(<; zSAHfiWol_1WhKf;9HVg5-E5Rpc*>(iwV-jS#8tlg<0A8=TU5f3tZAp#sM0X$#u`{- z$EOx99P8=q!BcH$sqmDGhl@th>SXN2<@3VIn4!)mY!KIl5}LjT4$!x&7mLM}ib8mm z#H8b!0ZwG1%(1Ddd=WCuLXI-VVs}!!* z?2I}Fy4$;nXq?#iOy6eZWd0=ie4gB!xqAw=fH`BQgCrQ%j>OZFx(P^3GJErd%42Jl z{Id0ZAK&*^{+W|aDcPc{aTSY2DM4gHQq!DtnZ2+%TZin7E2XYbd9~+y4hRr9(XPHyxlTjeLn}7TmBm9EwWH8 zVNy+(-i_1h;P?CY=gS-!d+^X5)R_xQzYnx~JL-pb9{%>y^&ekZc&l)e|GoVU_Puo- TJL-Ok00000NkvXXu0mjfO^n6S diff --git a/src/lib/data/html/setting.png b/src/lib/data/html/setting.png deleted file mode 100644 index 86153a7fb4d02d73e911d7eefd1f1a197f1be5c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1151 zcmV-_1c3XAP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02{9W02{9XUK)`c00007bV*G`2iyS) z7XmQ$b6EQT00aL?L_t(Y$Gw$nOq+ES#-F#>!RYA9W;;sBfO-R3%8Y@TU|u&ak}TN= zEK1}yGBn174B|i%V_&kUi9zC0)__sLIHkyS8$vsXVp#%g3{=MfrA*XC5&zdN2$Fkywl)8jTyk@^%TL zAoUM2wGS z3k#9$lMy4MqilcwKua(Hf}-9xC!0)0LqY<6U0Q-zBtmRV3|iaU!Sg(nN+k$_z^r># zsIIJb@;u+N;}-q1xXotGOG!E2xU#YWgTa98tPJ!z95@=Kg(=AhnOug|)fKFJ*O}KX z`QI}PQw?AR+ju~rDC%#Mn9XK!bMu#$%in&(Wo2avDXA%f%jFV0o_oTNgFkS2d9VHU z5=qXHBM)M_cQ6#_{o=p;D>9vMkON7YR0-t?S~a7b^iQ z0N@^`@4oTLx`uU_r0KCC`` zt)byF$=a$HB9RCj%ONQ_395stUrI~gIKL?gf&%FEdU?^A{Cc%ob9Q=q8V3{#&>J)Y zfdHbSqL6Vi-CKFSsuIBXR(>vt&ngH8^evmH->#CLxRR=G}I>=5_x-z{qx-1+&Tbt zk8+(P03eskepesSr~#+}`2S#;Cz6ws1V^8v+hVDC`>}6wW23Dg{9t&~=*Z{@K@bZu zu}5=$8XW3xZ|f`zcBnfYebI#vFBCBheKrsX5EB!VJp;~xW&lgU4)uSJKLIXLqp8Q< RX?p+w002ovPDHLkV1f>~4Ke@# diff --git a/src/lib/data/html/speeddial.html b/src/lib/data/html/speeddial.html index a97af2d30..1f638cfed 100644 --- a/src/lib/data/html/speeddial.html +++ b/src/lib/data/html/speeddial.html @@ -6,7 +6,7 @@ html {background: #eeeeee url("%IMG_BACKGROUND%") no-repeat center center;background-size: %B_SIZE%;} body {font: 13px/22px "Helvetica Neue", Helvetica, Arial, sans-serif;color: #525c66;direction: %DIRECTION%;} body * {-webkit-user-select: none;font-size: 100%;line-height: 1.6;margin: 0px;} -.add {position: absolute;%RIGHT_STR%:10px;top:10px;width: 24px;height: 24px;background: url(%IMG_PLUS%); cursor: pointer;} +.add {position: absolute;%RIGHT_STR%:6px;top:10px;width: 32px;height: 32px;background: url(%IMG_PLUS%); cursor: pointer;} #quickdial {margin: auto;text-align: center;} #quickdial div.entry {position: relative; float: %LEFT_STR%; border-width: 10px; @@ -32,7 +32,7 @@ span.reload:hover {border-color: grey; border-radius: 4px;} .formTable {width: 350px;margin-%LEFT_STR%: auto;margin-%RIGHT_STR%: auto;margin-top: 15px;} .formTable input[type="text"] {width: 100%;-webkit-user-select: auto;} -.sett {position: absolute;%RIGHT_STR%:36px;top:10px;width: 24px;height: 24px;background: url(%IMG_SETTINGS%); cursor: pointer;} +.sett {position: absolute;%RIGHT_STR%:40px;top:10px;width: 32px;height: 32px;background: url(%IMG_SETTINGS%); cursor: pointer;} #settingsBox {margin-%LEFT_STR%:auto;margin-%RIGHT_STR%: auto;margin-top: 100px;width: 350px;height: auto;padding:0 8px;-webkit-border-image: url(%BOX-BORDER%) 25;-webkit-box-shadow: 0px 5px 80px #505050;border-radius:10px;border-width: 20px;} #settingsBox .content {margin-%LEFT_STR%:auto;margin-%RIGHT_STR%:auto;padding-bottom:2px;border-bottom: 1px solid #888;} #settingsBox .thumbhold {margin-%LEFT_STR%:auto;margin-%RIGHT_STR%:auto;margin-bottom: 5px;padding: 1px;border-radius: 10px;text-align:center;width:180px;height:100px;background: #AAA;} @@ -66,6 +66,19 @@ var DIAL_WIDTH = %SD-SIZE%; var editingId = -1; +function addSpeedDial() +{ + onEditClick(addBox('', NEW_PAGE, '')); + alignPage(); +} + +function configureSpeedDial() +{ + $('#fadeOverlay2').css({'filter' : 'alpha(opacity=100)'}).fadeIn(); + $('#fadeOverlay2').click(function() { $(this).fadeOut('slow'); }); + $('#settingsBox').click(function(event) { event.stopPropagation(); }); +} + function escapeTitle(title) { title = title.replace(/"/g, '"'); title = title.replace(/'/g, '''); @@ -400,8 +413,8 @@ $(document).ready(function () {
- - + +