[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/calligra/2.9] krita/ui: Revert "Advertise kickstarter in splash screen"
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2015-06-02 19:44:01
Message-ID: E1Yzs6T-0002nA-QV () scm ! kde ! org
[Download RAW message or body]
Git commit 4c9300e3c99c7bb4676bfb0876edd5ff97404e11 by Boudewijn Rempt.
Committed on 02/06/2015 at 19:30.
Pushed by rempt into branch 'calligra/2.9'.
Revert "Advertise kickstarter in splash screen"
This reverts commit 63e85317c1551789d20088961c8d2e9dd0e2135d.
M +41 -38 krita/ui/kis_splash_screen.cpp
M +17 -1 krita/ui/wdgsplash.ui
http://commits.kde.org/calligra/4c9300e3c99c7bb4676bfb0876edd5ff97404e11
diff --git a/krita/ui/kis_splash_screen.cpp b/krita/ui/kis_splash_screen.cpp
index 9272b23..3ec0c42 100644
--- a/krita/ui/kis_splash_screen.cpp
+++ b/krita/ui/kis_splash_screen.cpp
@@ -53,56 +53,59 @@ KisSplashScreen::KisSplashScreen(const QString &version, const \
QPixmap &pixmap, bool hideSplash = cfg.readEntry("HideSplashAfterStartup", false);
chkShowAtStartup->setChecked(hideSplash);
- lblLinks->setFixedWidth(pixmap.width());
- lblLinks->setWordWrap(true);
lblLinks->setTextFormat(Qt::RichText);
lblLinks->setText(i18n("<html>"
"<head/>"
"<body>"
+ "<p align=\"center\"><b>Links</b></p>"
- "<p align=\"center\"><b><a \
href=\"https://krita.org/kickstarter/\"><span style=\" text-decoration: underline; \
color:#FFFFFF;\">Support Krita's Kickstarter!</span></a></b></p><p/>" + \
"<p><a href=\"https://krita.org/support-us/donations/\"><span style=\" \
text-decoration: underline; color:#FFFFFF;\">Support Krita</span></a></p>"
- "<p>During May, Krita is running a kickstarter campaign. \
We're crowdfunding performance improvements, animation support and a host of exciting \
stretch goals. Help us make Krita even better!</p>" + \
"<p><a href=\"http://krita.org/resources\"><span style=\" text-decoration: underline; \
color:#FFFFFF;\">Getting Started</span></a></p>" + "<p><a \
href=\"http://userbase.kde.org/Krita\"><span style=\" text-decoration: underline; \
color:#FFFFFF;\">Manual</span></a></p>" + "<p><a \
href=\"http://krita.org\"><span style=\" text-decoration: underline; \
color:#FFFFFF;\">Krita Website</span></a></p>" + "<p><a \
href=\"http://forum.kde.org/viewforum.php?f=136\"><span style=\" text-decoration: \
underline; color:#FFFFFF;\">User Community</span></a></p>"
+ "<p><a \
href=\"https://projects.kde.org/projects/calligra\"><span style=\" text-decoration: \
underline; color:#FFFFFF;\">Source Code</span></a></p>" +
+ "<p><a \
href=\"http://store.steampowered.com/app/280680/\"><span style=\" text-decoration: \
underline; color:#FFFFFF;\">Krita on Steam</span></a></p>" "</body>"
"</html>"));
lblVersion->setText(i18n("Version: %1", version));
-// KConfigGroup cfg2(KisFactory::componentData().config(), "RecentFiles");
-// int i = 1;
-
-// QString recent = i18n("<html>"
-// "<head/>"
-// "<body>"
-// "<p align=\"center\"><b>Recent Files</b></p>");
-
-// QString path;
-// QStringList recentfiles;
-
-// do {
-// path = cfg2.readPathEntry(QString("File%1").arg(i), QString());
-// if (!path.isEmpty()) {
-// QString name = cfg2.readPathEntry(QString("Name%1").arg(i), \
QString());
-// KUrl url(path);
-// if (name.isEmpty())
-// name = url.fileName();
-
-// if (!url.isLocalFile() || QFile::exists(url.toLocalFile())) {
-// recentfiles.insert(0, QString("<p><a href=\"%1\"><span \
style=\"color:#FFFFFF;\">%2</span></a></p>").arg(path).arg(name));
-// }
-// }
-
-// i++;
-// } while (!path.isEmpty() || i <= 8);
-
-// recent += recentfiles.join("\n");
-// recent += "</body>"
-// "</html>";
-// lblRecent->setText(recent);
-// lblRecent->hide();
-
-// connect(lblRecent, SIGNAL(linkActivated(QString)), \
SLOT(linkClicked(QString))); + KConfigGroup \
cfg2(KisFactory::componentData().config(), "RecentFiles"); + int i = 1;
+
+ QString recent = i18n("<html>"
+ "<head/>"
+ "<body>"
+ "<p align=\"center\"><b>Recent Files</b></p>");
+
+ QString path;
+ QStringList recentfiles;
+
+ do {
+ path = cfg2.readPathEntry(QString("File%1").arg(i), QString());
+ if (!path.isEmpty()) {
+ QString name = cfg2.readPathEntry(QString("Name%1").arg(i), QString());
+ KUrl url(path);
+ if (name.isEmpty())
+ name = url.fileName();
+
+ if (!url.isLocalFile() || QFile::exists(url.toLocalFile())) {
+ recentfiles.insert(0, QString("<p><a href=\"%1\"><span \
style=\"color:#FFFFFF;\">%2</span></a></p>").arg(path).arg(name)); + }
+ }
+
+ i++;
+ } while (!path.isEmpty() || i <= 8);
+
+ recent += recentfiles.join("\n");
+ recent += "</body>"
+ "</html>";
+ lblRecent->setText(recent);
+ connect(lblRecent, SIGNAL(linkActivated(QString)), SLOT(linkClicked(QString)));
}
diff --git a/krita/ui/wdgsplash.ui b/krita/ui/wdgsplash.ui
index a85f02b..5cb5412 100644
--- a/krita/ui/wdgsplash.ui
+++ b/krita/ui/wdgsplash.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>440</width>
- <height>384</height>
+ <height>381</height>
</rect>
</property>
<property name="sizePolicy">
@@ -386,6 +386,22 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QLabel" name="lblRecent">
+ <property name="text">
+ <string><html><head/><body><p \
align="center"><span style=" font-weight:600;">Recent \
files</span></p></body></html></string> + </property>
+ <property name="textFormat">
+ <enum>Qt::RichText</enum>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="openExternalLinks">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic