This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from a01b282 x2goutils.{cpp,h}: reformat only. new 47c59d8 helpdialog.cpp: change to monospaced font. new 5372761 helpdialog.{cpp,h}: whitespace only. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + src/helpdialog.cpp | 21 +++++++++++---------- src/helpdialog.h | 13 +++++++------ 3 files changed, 19 insertions(+), 16 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 47c59d8824523a147566912c1cd1c6e4e03a5287 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 23 16:18:13 2015 +0200 helpdialog.cpp: change to monospaced font. --- debian/changelog | 1 + src/helpdialog.cpp | 7 +++++-- src/helpdialog.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0488684..72886f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -295,6 +295,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low string. - help.cpp: use new git_changelog_extract_commit_sha() helper while building the help prelude. + - helpdialog.cpp: change to monospaced font. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/helpdialog.cpp b/src/helpdialog.cpp index a30b2eb..cc6a5b0 100644 --- a/src/helpdialog.cpp +++ b/src/helpdialog.cpp @@ -1,6 +1,7 @@ /************************************************************************** * Copyright (C) 2005-2015 by Oleksandr Shneyder * * o.shneyder@phoca-gmbh.de * +* Copyright (C) 2015 by Mihai Moldovan <ionic@ionic.de> * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -24,8 +25,10 @@ HelpDialog::HelpDialog(QWidget* parent): QDialog(parent) void HelpDialog::setText(QString text) { - text.replace("\t\t\t","\t"); - text.replace("\t\t","\t"); + QFont font ("monospace"); + font.setStyleHint (QFont::Monospace); + plainTextEdit->setFont (font); + plainTextEdit->setTabStopWidth(30); plainTextEdit->setWordWrapMode(QTextOption::NoWrap); plainTextEdit->setPlainText(text); diff --git a/src/helpdialog.h b/src/helpdialog.h index 9a91f73..4bc8be5 100644 --- a/src/helpdialog.h +++ b/src/helpdialog.h @@ -1,6 +1,7 @@ /************************************************************************** * Copyright (C) 2005-2015 by Oleksandr Shneyder * * o.shneyder@phoca-gmbh.de * +* Copyright (C) 2015 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 53727612e5bf50b9c358a1f3d23c22c67b3e9675 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 23 16:19:57 2015 +0200 helpdialog.{cpp,h}: whitespace only. --- src/helpdialog.cpp | 14 ++++++-------- src/helpdialog.h | 12 ++++++------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/helpdialog.cpp b/src/helpdialog.cpp index cc6a5b0..67b118c 100644 --- a/src/helpdialog.cpp +++ b/src/helpdialog.cpp @@ -18,19 +18,17 @@ #include "helpdialog.h" -HelpDialog::HelpDialog(QWidget* parent): QDialog(parent) -{ - setupUi(this); +HelpDialog::HelpDialog (QWidget *parent): QDialog (parent) { + setupUi (this); } -void HelpDialog::setText(QString text) -{ +void HelpDialog::setText (QString text) { QFont font ("monospace"); font.setStyleHint (QFont::Monospace); plainTextEdit->setFont (font); - plainTextEdit->setTabStopWidth(30); - plainTextEdit->setWordWrapMode(QTextOption::NoWrap); - plainTextEdit->setPlainText(text); + plainTextEdit->setTabStopWidth (30); + plainTextEdit->setWordWrapMode (QTextOption::NoWrap); + plainTextEdit->setPlainText (text); } diff --git a/src/helpdialog.h b/src/helpdialog.h index 4bc8be5..519d121 100644 --- a/src/helpdialog.h +++ b/src/helpdialog.h @@ -20,11 +20,11 @@ #define HELPDIALOG_H #include "ui_helpdialog.h" -class HelpDialog:public QDialog, public Ui_HelpDialog -{ -public: - HelpDialog(QWidget* parent=0); - void setText(QString text); + +class HelpDialog : public QDialog, public Ui_HelpDialog { + public: + HelpDialog (QWidget *parent = 0); + void setText (QString text); }; -#endif // HELPDIALOG_H +#endif /* !defined (HELPDIALOG_H) */ -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org