From e806880b7859a0e581390c7724e8add2bcbb0875 Mon Sep 17 00:00:00 2001 From: Jacob Dawid Date: Sat, 25 Jun 2016 16:31:53 +0200 Subject: [PATCH] Some refinements. --- .gitmodules | 3 -- .podinfo | 6 --- pods-subdirs.pri | 1 - pods.pri | 1 - qt-pods-gui/mainwindow.cpp | 32 ------------- qt-pods-gui/mainwindow.h | 4 -- qt-pods-gui/mainwindow.ui | 94 ++----------------------------------- qt-pods-gui/qt-pods-gui.pro | 2 +- qt-pods.pro | 4 +- qtirc | 1 - 10 files changed, 8 insertions(+), 140 deletions(-) delete mode 160000 qtirc diff --git a/.gitmodules b/.gitmodules index 985199b..b3b9b2c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "qtwaitingspinner"] path = qtwaitingspinner url = https://github.com/cybercatalyst/qtwaitingspinner.git -[submodule "qtirc"] - path = qtirc - url = https://github.com/cybercatalyst/qtirc.git [submodule "qt-pods-core"] path = qt-pods-core url = https://github.com/qt-pods/qt-pods-core.git diff --git a/.podinfo b/.podinfo index 174cd86..62e0022 100644 --- a/.podinfo +++ b/.podinfo @@ -4,12 +4,6 @@ description=Qt Pods managment functions. license=GPLv3 website= -[qtirc] -author=Jacob Dawid -description=IRC chat client. -license=GPLv3 -website= - [qtwaitingspinner] author="Alexander Turkin, William Hallatt, Jacob Dawid" description=Floating waiting spinner widget. diff --git a/pods-subdirs.pri b/pods-subdirs.pri index 2962ac1..d7f0cb5 100644 --- a/pods-subdirs.pri +++ b/pods-subdirs.pri @@ -5,6 +5,5 @@ SUBDIRS += \ qt-pods-core \ - qtirc \ qtwaitingspinner diff --git a/pods.pri b/pods.pri index bb04e41..b6b4421 100644 --- a/pods.pri +++ b/pods.pri @@ -4,6 +4,5 @@ # This file should be put under version control. include(qt-pods-core/qt-pods-core.pri) -include(qtirc/qtirc.pri) include(qtwaitingspinner/qtwaitingspinner.pri) diff --git a/qt-pods-gui/mainwindow.cpp b/qt-pods-gui/mainwindow.cpp index db19995..17dffd7 100644 --- a/qt-pods-gui/mainwindow.cpp +++ b/qt-pods-gui/mainwindow.cpp @@ -37,12 +37,6 @@ #include #endif -class CustomWebPage : public QWebPage { - virtual QString userAgentForUrl(const QUrl&) const { - return "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36"; - } -}; - MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { @@ -113,10 +107,6 @@ MainWindow::MainWindow(QWidget *parent) : _availablePodsSpinnerWidget = new WaitingSpinnerWidget(ui->tabAvailablePods); _localPodsSpinnerWidget = new WaitingSpinnerWidget(ui->tabLocalPods); _developmentToolsSpinnerWidget = new WaitingSpinnerWidget(ui->tabDevelopmentTools); - _webViewSpinnerWidget = new WaitingSpinnerWidget(ui->webViewDevelopment); - - connect(ui->webViewDevelopment, SIGNAL(loadStarted()), _webViewSpinnerWidget, SLOT(start())); - connect(ui->webViewDevelopment, SIGNAL(loadFinished(bool)), _webViewSpinnerWidget, SLOT(stop())); updateBuildInfo(); loadSettings(); @@ -124,10 +114,6 @@ MainWindow::MainWindow(QWidget *parent) : #ifndef QT_DEBUG ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabDiagnostic)); #endif - - ui->ircWidget->connectToServer("qtpodsuser", "irc.freenode.net", 6667, "#qtpods"); - ui->webViewDevelopment->setPage(new CustomWebPage); - ui->webViewDevelopment->load(QUrl("https://github.com/cybercatalyst/qt-pods/issues")); } MainWindow::~MainWindow() { @@ -562,24 +548,6 @@ void MainWindow::on_pushButtonDevelopmentPodInstall_clicked() { } } -void MainWindow::on_webViewDevelopment_urlChanged(QUrl url) { -#ifdef QT_DEBUG - qDebug() << __TIME__ << "[on_webViewDevelopment_urlChanged]"; -#endif - ui->lineEditDevelopmentUrl->setText(url.toString()); -} - -void MainWindow::on_lineEditDevelopmentUrl_returnPressed() { -#ifdef QT_DEBUG - qDebug() << __TIME__ << "[on_lineEditDevelopmentUrl_returnPressed]"; -#endif - QString urlString = ui->lineEditDevelopmentUrl->text(); - if(!urlString.startsWith("http")) { - urlString.prepend("http://"); - } - ui->webViewDevelopment->load(QUrl(urlString)); -} - void MainWindow::closeEvent(QCloseEvent *closeEvent) { #ifdef QT_DEBUG qDebug() << __TIME__ << "[closeEvent]"; diff --git a/qt-pods-gui/mainwindow.h b/qt-pods-gui/mainwindow.h index 63872bf..0ee4cd9 100644 --- a/qt-pods-gui/mainwindow.h +++ b/qt-pods-gui/mainwindow.h @@ -84,9 +84,6 @@ public slots: void on_pushButtonDevelopmentPodSanityCheck_clicked(); void on_pushButtonDevelopmentPodInstall_clicked(); - void on_webViewDevelopment_urlChanged(QUrl url); - void on_lineEditDevelopmentUrl_returnPressed(); - protected: void closeEvent(QCloseEvent *closeEvent); @@ -128,7 +125,6 @@ private slots: WaitingSpinnerWidget *_availablePodsSpinnerWidget; WaitingSpinnerWidget *_localPodsSpinnerWidget; WaitingSpinnerWidget *_developmentToolsSpinnerWidget; - WaitingSpinnerWidget *_webViewSpinnerWidget; Ui::MainWindow *ui; }; diff --git a/qt-pods-gui/mainwindow.ui b/qt-pods-gui/mainwindow.ui index d5bae99..190268c 100644 --- a/qt-pods-gui/mainwindow.ui +++ b/qt-pods-gui/mainwindow.ui @@ -309,16 +309,16 @@ true - Attempt to update all pods in the current repository. + Attempt to update selected pods in the current repository. - Attempt to update all pods in the current repository. + Attempt to update selected pods in the current repository. - Attempt to update all pods in the current repository. + Attempt to update selected pods in the current repository. - Update pods + Update selected pods @@ -625,60 +625,6 @@ - - - - :/icons/icons/empathy.svg:/icons/icons/empathy.svg - - - Community chat - - - - - - - - - - - :/icons/icons/setroubleshoot_icon.svg:/icons/icons/setroubleshoot_icon.svg - - - Development - - - - - - - - - - - Back - - - - - - - - - - about:blank - - - - 1.000000000000000 - - - QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing - - - - - Tools for pod developers. @@ -965,38 +911,8 @@ - - - QWebView - QWidget -
QtWebKitWidgets/QWebView
- - - IRCWidget - QWidget -
ircwidget.h
- 1 - - - - - pushButtonDevelopmentBack - clicked() - webViewDevelopment - back() - - - 845 - 98 - - - 454 - 367 - - - - + diff --git a/qt-pods-gui/qt-pods-gui.pro b/qt-pods-gui/qt-pods-gui.pro index 7238086..f39cd2c 100644 --- a/qt-pods-gui/qt-pods-gui.pro +++ b/qt-pods-gui/qt-pods-gui.pro @@ -18,7 +18,7 @@ ## ## ##############################################################################/ -QT += core gui network widgets webkitwidgets svg +QT += core gui network widgets svg TARGET = qt-pods-gui TEMPLATE = app diff --git a/qt-pods.pro b/qt-pods.pro index 57fd062..a8671c8 100644 --- a/qt-pods.pro +++ b/qt-pods.pro @@ -4,5 +4,5 @@ SUBDIRS += \ qt-pods-gui \ qt-pods-cli -qt-pods-cli.depends = qt-pods-core qtirc qtwaitingspinner -qt-pods-gui.depends = qt-pods-core qtirc qtwaitingspinner +qt-pods-cli.depends = qt-pods-core qtwaitingspinner +qt-pods-gui.depends = qt-pods-core qtwaitingspinner diff --git a/qtirc b/qtirc deleted file mode 160000 index 410c11b..0000000 --- a/qtirc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 410c11b60e2eb953b852df43febcccb3194128f7