summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/data/home.html44
-rw-r--r--src/main.cpp51
-rw-r--r--src/mainview.cpp11
-rw-r--r--src/mainview.h1
-rw-r--r--src/mainwindow.cpp10
-rw-r--r--src/settings/appearancewidget.cpp10
-rw-r--r--src/settings/appearancewidget.h3
-rw-r--r--src/settings/settings_appearance.ui7
-rw-r--r--src/urlbar/listitem.cpp11
-rw-r--r--src/urlbar/rsswidget.cpp5
10 files changed, 106 insertions, 47 deletions
diff --git a/src/data/home.html b/src/data/home.html
index 25236743..cedd8855 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -40,9 +40,7 @@ font: normal bold 1em;
a {
color: #3F7AB7;
text-decoration: none;
--webkit-transition-property: color;
--webkit-transition-duration: 0.5s;
--webkit-transition-timing-function: ease;
+-webkit-transition: color 0.5s ease;
}
a:hover {
color: black;
@@ -81,7 +79,12 @@ height: 16px;
.link {
display: inline-block;
+-webkit-transition: opacity 0.5s ease;
}
+.link:not(.current):hover {
+opacity: 0.6;
+}
+
.link img, .link span {
vertical-align: middle; display: inline-block;
}
@@ -89,15 +92,6 @@ vertical-align: middle; display: inline-block;
color: black;
}
-#actions .link {
--webkit-transition-property: opacity;
--webkit-transition-duration: 0.8s;
--webkit-transition-timing-function: ease;
-opacity: 0.2;
-}
-#actions .link:hover {
-opacity: 1;
-}
#actions .link img {
margin-right: 3px; width: 16px;
}
@@ -141,22 +135,13 @@ background: url(%2/bg.png) no-repeat;
padding: 0 12px;
}
-.thumbnail:hover .preview ,
-.thumbnail:hover .button img {
-opacity: 0.8;
-}
-.button img, .preview {
--webkit-transition-property: opacity;
--webkit-transition-duration: 0.8s;
--webkit-transition-timing-function: ease-in-out;
-}
-
.button img {
display: inline-block;
width: 16px;
height: 16px;
opacity: 0;
}
+
.remove {
float: right;
}
@@ -164,7 +149,20 @@ float: right;
float: left;
}
-.thumbnail a:hover, .thumbnail span {
+.button img, .preview {
+-webkit-transition: opacity 0.8s ease-in-out;
+}
+.thumb-inner:hover .preview {
+opacity: 0.6;
+}
+.thumb-inner:hover .button img {
+opacity: 0.4;
+-webkit-transition: opacity 0.8s ease-out;
+}
+.thumb-inner .button img:hover {
+opacity: 1;
+}
+.thumbnail a:hover {
color:#3F7AB7;
}
diff --git a/src/main.cpp b/src/main.cpp
index 5551c55a..2697c741 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -69,7 +69,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
ki18n("Developer, Ideas, Mockups. And the icon."),
"megabigbug@yahoo.fr",
"");
-
+
about.addAuthor(ki18n("Johannes Zellner"),
ki18n("Patches, suggestions, testing, bugfixing"),
"webmaster@nebulon.de",
@@ -85,15 +85,41 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
"ronny_scholz@web.de",
"");
+ about.addAuthor(ki18n("Rohan Garg"),
+ ki18n("Handbook, maintains a Kubuntu PPA with rekonq git packages"),
+ "rohan16garg@gmail.com",
+ "");
+
+ about.addAuthor(ki18n("Yoann Laissus"),
+ ki18n("Developer, history & bookmarks improvements"),
+ "yoann.laissus@gmail.com",
+ "");
+
+ about.addAuthor(ki18n("Cedric Bellegarde"),
+ ki18n("Patched code quite everywhere :)"),
+ "gnumdk@adishatz.1s.fr",
+ "");
+
+ about.addAuthor(ki18n("Jonathan Raphael Joachim Kolberg"),
+ ki18n("Handbook, maintains a Kubuntu PPA with rekonq git packages"),
+ "bulldog98@freenet.de",
+ "");
+
+
// --------------- about credits -----------------------------
- about.addCredit(ki18n("Domrachev Alexandr"),
- ki18n("Developer"),
- "alexandr.domrachev@gmail.com",
+ about.addCredit(ki18n("Lindsay Mathieson"),
+ ki18n("Provided patches & hints. Discovered bugs"),
+ "lindsay.mathieson@gmail.com",
+ "");
+
+ about.addCredit(ki18n("Abdurrahman AVCI"),
+ ki18n("Provided patches & hints"),
+ "abdurrahmanavci@gmail.com",
"");
- about.addCredit(ki18n("Henry de Valence"),
- ki18n("Promised help on multitask rekonq"),
- "hdevalence@gmail.com",
+ about.addCredit(ki18n("Domrachev Alexandr"),
+ ki18n("Former Developer"),
+ "alexandr.domrachev@gmail.com",
"");
about.addCredit(ki18n("Abuus"),
@@ -112,22 +138,17 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
"");
about.addCredit(ki18n("Pawel Prazak"),
- ki18n("Developer"),
+ ki18n("Former Developer"),
"kojots350@gmail.com",
"");
- about.addCredit(ki18n("Rohan Garg"),
- ki18n("Handbook"),
- "rohan16garg@gmail.com",
- "");
-
about.addCredit(ki18n("Dario Freddi"),
- ki18n("Patches, hints, first KWallet support implementation (not yet included)"),
+ ki18n("Patches, hints, first KWallet support implementation"),
"drf@kde.org",
"");
about.addCredit(ki18n("Jon de Andrés Frías"),
- ki18n("first awesome bar implementation (wait next version and you'll see..)"),
+ ki18n("first awesome bar implementation"),
"jondeandres@gmail.com",
"");
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 932af009..b7ad7543 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -659,6 +659,17 @@ void MainView::openClosedTab()
}
}
+void MainView::switchToTab()
+{
+ // uses the sender to determine the tab index
+ QAction *sender = static_cast<QAction*>(QObject::sender());
+ int index = sender->data().toInt();
+ index -= 1; // to compensate for off by 1 presented to the user
+ if( index < 0 || index >= count() )
+ return;
+ setCurrentIndex( index );
+}
+
QLabel *MainView::animatedLoading(int index, bool addMovie)
{
if (index == -1)
diff --git a/src/mainview.h b/src/mainview.h
index 0cff4c81..636d37ac 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -135,6 +135,7 @@ public slots:
void detachTab(int index = -1);
void openClosedTabs();
void openClosedTab();
+ void switchToTab();
// WEB slot actions
void webReload();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f5be73ee..d14f2254 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -398,6 +398,16 @@ void MainWindow::setupActions()
closedTabsMenu->setDelayed(false);
actionCollection()->addAction(QL1S("closed_tab_menu"), closedTabsMenu);
+ // shortcuts for quickly switching to a tab
+ for( int i = 1; i <= 9; i++ ) {
+ a = new KAction(i18n("Switch to Tab %1", i), this);
+ a->setShortcut(KShortcut( QString("Alt+%1").arg(i) ));
+ a->setData( QVariant(i) );
+ actionCollection()->addAction(QL1S(("switch_tab_" + QString::number(i)).toAscii()), a);
+ connect(a, SIGNAL(triggered(bool)), m_view, SLOT(switchToTab()));
+ }
+
+
// ============================== Indexed Tab Actions ====================================
a = new KAction(KIcon("tab-close"), i18n("&Close Tab"), this);
actionCollection()->addAction(QL1S("close_tab"), a);
diff --git a/src/settings/appearancewidget.cpp b/src/settings/appearancewidget.cpp
index 875b67d2..40f53a85 100644
--- a/src/settings/appearancewidget.cpp
+++ b/src/settings/appearancewidget.cpp
@@ -28,14 +28,20 @@
#include "appearancewidget.h"
#include "appearancewidget.moc"
+// KDE Includes
+#include <KFontRequester>
+
AppearanceWidget::AppearanceWidget(QWidget *parent)
: QWidget(parent)
, _changed(false)
{
setupUi(this);
-
-// kcfg_fixedFont->setOnlyFixed(true);
+
+ KFontRequester *fixedFontRequester = new KFontRequester(this, true);
+ fixedFontRequester->setObjectName( QL1S("kcfg_fixedFont") );
+
+ gridLayout->addWidget(fixedFontRequester, 1, 1, 1, 1);
}
diff --git a/src/settings/appearancewidget.h b/src/settings/appearancewidget.h
index 0e400031..5c7ddc6d 100644
--- a/src/settings/appearancewidget.h
+++ b/src/settings/appearancewidget.h
@@ -28,6 +28,9 @@
#define APPEARANCE_WIDGET_H
+// Rekonq Includes
+#include "rekonq_defines.h"
+
// Ui Includes
#include "ui_settings_appearance.h"
diff --git a/src/settings/settings_appearance.ui b/src/settings/settings_appearance.ui
index b564033c..92d15cc6 100644
--- a/src/settings/settings_appearance.ui
+++ b/src/settings/settings_appearance.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>454</width>
- <height>371</height>
+ <width>529</width>
+ <height>429</height>
</rect>
</property>
<property name="windowTitle">
@@ -67,9 +67,6 @@
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="KFontRequester" name="kcfg_fixedFont"/>
- </item>
<item row="6" column="0">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index f91840d2..5254c7dc 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -220,7 +220,16 @@ PreviewListItem::PreviewListItem(const UrlSearchItem &item, const QString &text,
QVBoxLayout *vLayout = new QVBoxLayout;
vLayout->setMargin(0);
- vLayout->addWidget(new TextLabel(item.title, text, this));
+
+ QString title = item.title;
+ if (title.isEmpty())
+ {
+ title = item.url.url();
+ title = title.remove("http://");
+ title.truncate(title.indexOf("/"));
+ }
+
+ vLayout->addWidget(new TextLabel(title, text, this));
vLayout->addWidget(new TextLabel("<i>" + item.url.url() + "</i>", text, this));
hLayout->addLayout(vLayout);
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index 35095c07..ae96dfae 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -115,9 +115,12 @@ RSSWidget::~RSSWidget()
void RSSWidget::showAt(const QPoint &pos)
{
+ adjustSize();
+
QPoint p;
- p.setX(pos.x() - 200);
+ p.setX(pos.x() - width());
p.setY(pos.y() + 10);
+
move(p);
show();
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 19:58:39 +0000