Skip to content

Commit

Permalink
Ajout d'un embryon de NetworkSettings (ne fait rien pour le moment)
Browse files Browse the repository at this point in the history 
La dockabilité du palmi est parametrable
  • Loading branch information
dguihal@gmail.com committed Feb 1, 2015
1 parent c4bb3d4 commit 0755f4d
Show file tree
Hide file tree
Showing 22 changed files with 936 additions and 455 deletions.
2 changes: 2 additions & 0 deletions core/qqsettingsparams.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ const char notif_name[] = "QuteQoin";
// PALMI
#define SETTINGS_PALMI_MINI "palmi_minimized"
#define DEFAULT_PALMI_MINI false
#define SETTINGS_PALMI_DOCKED "palmi_docked"
#define DEFAULT_PALMI_DOCKED false
#define SETTINGS_PALMI_SHORCUTS "palmi_shortcuts"
#define SETTINGS_PALMI_SHORTCUTS_MIN_KEY Qt::Key_Space
#define SETTINGS_PALMI_SHORTCUTS_MAX_KEY Qt::Key_AsciiTilde
Expand Down
3 changes: 3 additions & 0 deletions core/qqwebimagedownloader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ void QQWebImageDownloader::requestFinishedSlot(QNetworkReply *reply)
QString statusCodeV = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString();
QString errString = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();

m_dataContentType.clear();
m_data.clear();

qWarning() << Q_FUNC_INFO << "error : " << errString << "HTTP statusCode : " << statusCodeV;
} // Tout est OK on poursuit
else
Expand Down
6 changes: 4 additions & 2 deletions main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include <libnotify/notify.h>
#endif

//#define QQ_ENABLE_QML true

bool removeDirRecursive(const QString &dirName)
{
bool result = true;
Expand Down Expand Up @@ -96,7 +98,7 @@ int main(int argc, char *argv[])
MainWindow w;
w.show();

#if 0
#ifdef ENABLE_QML
#ifdef QT_DEBUG
#if(QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
qmlRegisterType<DocumentHandler>("org.moules.quteqoin", 1, 0, "DocumentHandler");
Expand All @@ -119,7 +121,7 @@ int main(int argc, char *argv[])
*/
#endif //QT_VERSION
#endif //QT_DEBUG
#endif
#endif //QQ_ENABLE_QML

return a.exec();
}
74 changes: 42 additions & 32 deletions mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "core/qqsettings.h"
#include "ui/qqboardsinfo.h"
#include "ui/qqpalmipede.h"
#include "ui/palmipede/qqdockpalmi.h"
#include "ui/qqpinipede.h"
#include "ui/qqpinisearchwidget.h"
#include "ui/qqsettingsmanager.h"
Expand Down Expand Up @@ -34,14 +35,19 @@ MainWindow::MainWindow(QWidget *parent) :

// Setup du palmi
m_palmi = new QQPalmipede(this);
m_palmi->setAllowedAreas(Qt::TopDockWidgetArea |
Qt::BottomDockWidgetArea);
connect(m_palmi, SIGNAL(postMessage(QString,QString)), this, SLOT(doPostMessage(QString,QString)));
connect(m_palmi, SIGNAL(visibilityChanged(bool)), this, SLOT(palmiVisibilityChanged(bool)));
addDockWidget(Qt::BottomDockWidgetArea, m_palmi, Qt::Horizontal);

QAction *actionPalmi = m_palmi->toggleViewAction();
actionPalmi->setShortcut(Qt::ControlModifier + Qt::Key_P);
// Setup du dock du palmi
m_dockPalmi = new QQDockPalmi(this);
m_dockPalmi->setAllowedAreas(Qt::TopDockWidgetArea |
Qt::BottomDockWidgetArea);
addDockWidget(Qt::BottomDockWidgetArea, m_dockPalmi, Qt::Horizontal);

connect(m_dockPalmi, SIGNAL(visibilityChanged(bool)), this, SLOT(doPalmiVisibilityChanged(bool)));

m_actionDockPalmi = m_dockPalmi->toggleViewAction();
m_actionDockPalmi->setShortcut(Qt::ControlModifier + Qt::Key_P);
//actionDockPalmi->setDisabled(true);

// Setup du totoz manager
m_totozManager = new QQTotozManager(this);
Expand All @@ -65,7 +71,7 @@ MainWindow::MainWindow(QWidget *parent) :
// Setup du bouton d'options
QQCmdToolButtons *cmdToolsBtn = new QQCmdToolButtons(this);
cmdToolsBtn->addAction(actionBoardInfo);
cmdToolsBtn->addAction(actionPalmi);
cmdToolsBtn->addAction(m_actionDockPalmi);
cmdToolsBtn->addAction(actionTotozManager);

connect(cmdToolsBtn, SIGNAL(showOptions()), this, SLOT(displayOptions()));
Expand All @@ -74,6 +80,7 @@ MainWindow::MainWindow(QWidget *parent) :
QWidget *centralWidget = new QWidget(this);
QLayout *layout = new QVBoxLayout();
layout->setContentsMargins(1, 1, 1, 1);
layout->setSpacing(1);

m_pini = new QQPinipede(this);
m_pini->setToolButton(cmdToolsBtn);
Expand Down Expand Up @@ -117,16 +124,16 @@ MainWindow::MainWindow(QWidget *parent) :
windowsStateCacheFile.remove();

QQSettings settings;
//TODO : Remove later

//TODO : A supprimer
if(settings.contains(SETTINGS_MAINWINDOW_GEOMETRY))
settings.remove(SETTINGS_MAINWINDOW_GEOMETRY);
if(settings.contains(SETTINGS_MAINWINDOW_STATE))
settings.remove(SETTINGS_MAINWINDOW_STATE);
//Fin TODO

if(settings.value(SETTINGS_PALMI_MINI, DEFAULT_PALMI_MINI).toBool())
doTriggerMiniPalmi();
else
doTriggerMaxiPalmi();
doPalmiStatusChanged(settings.value(SETTINGS_PALMI_MINI, DEFAULT_PALMI_MINI).toBool(),
settings.value(SETTINGS_PALMI_DOCKED, DEFAULT_PALMI_DOCKED).toBool());

if(settings.value(SETTINGS_GENERAL_STEALTH_MODE, DEFAULT_GENERAL_STEALTH_MODE).toBool() &&
QSystemTrayIcon::isSystemTrayAvailable())
Expand Down Expand Up @@ -159,8 +166,7 @@ void MainWindow::displayOptions()

QQSettingsManager settingsManager(this);
connect(&settingsManager, SIGNAL(bouchotCreated(QQBouchot*)), this, SLOT(initBouchot(QQBouchot*)));
connect(&settingsManager, SIGNAL(minimizePalmi()), this, SLOT(doTriggerMiniPalmi()));
connect(&settingsManager, SIGNAL(maximizePalmi()), this, SLOT(doTriggerMaxiPalmi()));
connect(&settingsManager, SIGNAL(palmiStatusChanged(bool,bool)), this, SLOT(doPalmiStatusChanged(bool,bool)));
connect(&settingsManager, SIGNAL(fullRepaint()), this, SLOT(doFullRepaint()));
connect(&settingsManager, SIGNAL(totozSearchEnabledChanged(bool)), m_totozManager, SLOT(totozSearchEnabled(bool)));
settingsManager.exec();
Expand All @@ -180,31 +186,35 @@ void MainWindow::doPostMessage(const QString &bouchot, const QString &message)
// Bouchot non trouvé ???
}

void MainWindow::doTriggerMaxiPalmi()
void MainWindow::doPalmiStatusChanged(bool isPalmiMini, bool isPalmiDocked)
{
minimizePalmi(false);
}

void MainWindow::doTriggerMiniPalmi()
{
minimizePalmi(true);
}
m_palmi->setMinimal(isPalmiMini);

void MainWindow::minimizePalmi(bool isPalmiMini)
{
m_ui->actionPalmiExt->setChecked(! isPalmiMini);
m_ui->actionPalmiMini->setChecked(isPalmiMini);
m_actionDockPalmi->setVisible(isPalmiDocked);

QQSettings settings;
settings.setValueWithDefault(SETTINGS_PALMI_MINI, isPalmiMini, DEFAULT_PALMI_MINI);
QWidget *w = centralWidget();
QLayout *l = w->layout();
if(isPalmiDocked)
{
l->removeWidget(m_palmi);
m_palmi->setParent(m_dockPalmi);
m_dockPalmi->takePalmiWidget(m_palmi);
m_dockPalmi->show();
}
else
{
m_dockPalmi->releasePalmiWidget();
m_palmi->setParent(w);
l->addWidget(m_palmi);
m_dockPalmi->hide();
}

m_palmi->setMinimal(isPalmiMini);
m_palmi->setVisible(true);
}

void MainWindow::palmiVisibilityChanged(bool visible)
void MainWindow::doPalmiVisibilityChanged(bool isVisible)
{
m_ui->actionPalmiHidden->setChecked(! visible);
if(visible)
if(isVisible)
m_palmi->setFocus();
else
m_pini->setFocus();
Expand Down
11 changes: 7 additions & 4 deletions mainwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

class QQBoardsInfo;
class QQBouchot;
class QQDockPalmi;
class QQPalmipede;
class QQPinipede;
class QQPiniSearchWidget;
Expand All @@ -30,9 +31,8 @@ class MainWindow : public QMainWindow
public slots:
void displayOptions();
void doPostMessage(const QString &bouchot, const QString &message);
void doTriggerMaxiPalmi();
void doTriggerMiniPalmi();
void palmiVisibilityChanged(bool visible);
void doPalmiStatusChanged(bool isPalmiMini, bool isPalmiDocked);
void doPalmiVisibilityChanged(bool isVisible);

protected:
virtual void changeEvent(QEvent *event);
Expand All @@ -48,10 +48,13 @@ protected slots:

private:
void initBouchots();
void minimizePalmi(bool isPalmiMini);

Ui::MainWindow *m_ui;

QAction *m_actionDockPalmi;

QQBoardsInfo *m_boardsInfo;
QQDockPalmi *m_dockPalmi;
QQPalmipede *m_palmi;
QQPinipede *m_pini;
QQPiniSearchWidget *m_pSearchW;
Expand Down
89 changes: 0 additions & 89 deletions mainwindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,95 +18,6 @@
<normaloff>:/img/rubber_duck_yellow.svg</normaloff>:/img/rubber_duck_yellow.svg</iconset>
</property>
<widget class="QWidget" name="centralWidget"/>
<action name="actionTabbed">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Tabbed</string>
</property>
</action>
<action name="actionMixed">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Mixed</string>
</property>
</action>
<action name="actionMono">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Mono</string>
</property>
</action>
<action name="actionQuit">
<property name="text">
<string>Quit</string>
</property>
</action>
<action name="actionOptions">
<property name="text">
<string>Options</string>
</property>
</action>
<action name="actionEnregistrer_parametres">
<property name="text">
<string>Enregistrer parametres</string>
</property>
</action>
<action name="actionPalmiExt">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Etendu</string>
</property>
</action>
<action name="actionPalmiMini">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Minimal</string>
</property>
</action>
<action name="actionPalmiHidden">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Hidden</string>
</property>
<property name="shortcut">
<string>Ctrl+P</string>
</property>
</action>
<action name="actionTabul">
<property name="text">
<string>Tabulé</string>
</property>
</action>
<action name="actionEn_ligne">
<property name="text">
<string>En ligne</string>
</property>
</action>
<action name="actionTotoz">
<property name="text">
<string>Gestionnaire &amp;Totoz</string>
</property>
</action>
<action name="actionOptions_new">
<property name="text">
<string>Options (new)</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>
Expand Down
19 changes: 17 additions & 2 deletions qml/QQmlMain.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ ApplicationWindow {
query: "/board/post"

XmlRole { name: "login"; query: "login/string()" }
XmlRole { name: "ua"; query: "info/string()" }
XmlRole { name: "message"; query: "message/string()" }
XmlRole { name: "time"; query: "@time/string()" }
XmlRole { name: "ua"; query: "info/string()" }
}

ColumnLayout {
Expand Down Expand Up @@ -55,8 +56,22 @@ ApplicationWindow {
model: xmlModel
delegate: Text {
width: parent.width
text: "<b>" + login + "</b>\t" + message
wrapMode: Text.Wrap
function buildText()
{
var norloge = time.substring(time.length - 6);
var textData = "<b>[" + norloge.slice(0, 2) +
":" + norloge.slice(2, 4) +
":" + norloge.slice(4, 6) + "]</b> ";

if(login != "")
textData += "<font color=\"#553333\">" + login + "</font> " + message;
else
textData += "<font color=\"#883333\"><i>" + ua.slice(0, 15) + "</i></font> " + message;
text = textData;
}

Component.onCompleted: buildText()
}
}
/*
Expand Down
Loading

0 comments on commit 0755f4d

Please sign in to comment.