This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 0fe6b3a72faf0660df53256d91b4f22e57a1201e Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 23 23:30:28 2015 +0200 {helpdialog.cpp,x2goutils.h}: whitespace only. --- src/helpdialog.cpp | 38 +++++++++++++++++++------------------- src/x2goutils.h | 4 ++++ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/helpdialog.cpp b/src/helpdialog.cpp index d8fe9ad..877ecc8 100644 --- a/src/helpdialog.cpp +++ b/src/helpdialog.cpp @@ -21,36 +21,36 @@ #include "x2goutils.h" HelpDialog::HelpDialog (QWidget *parent): QDialog (parent) { - setupUi (this); + setupUi (this); } void HelpDialog::setText (QString text) { - /* Try real hard to get a monospaced font. */ - QFont font ("monospace"); + /* Try real hard to get a monospaced font. */ + QFont font ("monospace"); - if (!font_is_monospaced (font)) { + if (!font_is_monospaced (font)) { #if QT_VERSION >= 0x040700 - font.setStyleHint (QFont::Monospace); + font.setStyleHint (QFont::Monospace); #else - font.setStyleHint (QFont::TypeWriter); + font.setStyleHint (QFont::TypeWriter); #endif - } + } - if (!font_is_monospaced (font)) { - font.setFamily ("Courier New"); - } + if (!font_is_monospaced (font)) { + font.setFamily ("Courier New"); + } - if (!font_is_monospaced (font)) { - font.setFamily ("Courier"); - } + if (!font_is_monospaced (font)) { + font.setFamily ("Courier"); + } - /* If the font is not monospaced by now, there's not much else we can do... */ - font.setPointSize (10); + /* If the font is not monospaced by now, there's not much else we can do... */ + font.setPointSize (10); - plainTextEdit->setFont (font); + 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/x2goutils.h b/src/x2goutils.h index e438d0f..2617b1b 100644 --- a/src/x2goutils.h +++ b/src/x2goutils.h @@ -24,10 +24,14 @@ #define UNUSED(x) do { (void) x; } while (0) QString expandHome (QString path); + QString fixup_resource_URIs (const QString &res_path); + QString wrap_legacy_resource_URIs (const QString &res_path); + QString convert_to_rich_text (const QString &text, bool force = false); void show_RichText_WarningMsgBox (const QString &main_text, const QString &informative_text = ""); + QString git_changelog_extract_commit_sha (const QString &gitlog); bool font_is_monospaced (const QFont &font); -- 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 bf9294c223e2ed31dfd3571d4d1a1fe8c2bda1d2 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Apr 24 00:37:20 2015 +0200 help.{cpp,h}: provide string splitting logic as separate split_long_line() function. Use this in pretty_print(). --- debian/changelog | 2 ++ src/help.cpp | 62 ++++++++++++++++++++++++++++-------------------------- src/help.h | 13 ++++++++++++ 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7bb0bce..dbe7eaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -303,6 +303,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - helpdialog.cpp: lower font size to have more space for text. - ui/helpdialog.ui: almost double the window size. - help.cpp: typo fix for --git-info. + - help.{cpp,h}: provide string splitting logic as separate + split_long_line() function. Use this in pretty_print(). [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/help.cpp b/src/help.cpp index bd0a4a0..78bef9e 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -167,6 +167,24 @@ QString help::pretty_print () { return (help::pretty_print (help::build_data ())); } +help::string_split_t help::split_long_line (QString &line, std::ptrdiff_t max_length) { + string_split_t ret (line, ""); + + if (line.size () > max_length) { + /* Try to find the next split point. */ + std::ptrdiff_t split_point = line.lastIndexOf (" ", max_length - 1); + + /* Only care for valid split points. */ + if (0 <= split_point) { + x2goDebug << "Split onto " << line.left (split_point) << " and new part " << line.mid (split_point + 1); + ret.first = line.left (split_point); + ret.second = line.mid (split_point + 1); + } + } + + return (ret); +} + QString help::pretty_print (help::data_t data) { QString ret = ""; QTextStream out (&ret); @@ -238,36 +256,20 @@ QString help::pretty_print (help::data_t data) { cur_len = working_copy.size (); x2goDebug << "Trying to fit a (remaining) description " << cur_len << " characters wide." << endl; - /* Fits onto the current line. Great! */ - if (remaining > static_cast<std::ptrdiff_t> (cur_len)) { - x2goDebug << "Fit onto the current line. Done." << endl; - out << working_copy; - working_copy = ""; - } - else { - /* Try to find the next split point. */ - std::ptrdiff_t split_point = working_copy.lastIndexOf (" ", remaining - 1); - - if (-1 == split_point) { - /* No split point available. Just print it out and hope for better times... */ - out << working_copy; - working_copy = ""; - } - else { - /* Yay, we can split. */ - x2goDebug << "Split onto " << working_copy.left (split_point); - out << working_copy.left (split_point); - - x2goDebug << " and new part " << working_copy.mid (split_point + 1); - working_copy = working_copy.mid (split_point + 1); - - /* Do the next chunk, if there are remaining characters. */ - if (!working_copy.isEmpty ()) { - out << "\n"; - indent = terminal_cols - remaining; - out << QString (" ").repeated (indent); - } - } + string_split_t string_split = split_long_line (working_copy, remaining); + working_copy = string_split.first; + + /* Print potentially splitted line. */ + out << working_copy; + + /* Continue with next chunk. */ + working_copy = string_split.second;; + + /* Print whitespace if the remainder string is non-empty. */ + if (!working_copy.isEmpty ()) { + out << "\n"; + indent = terminal_cols - remaining; + out << QString (" ").repeated (indent); } } } diff --git a/src/help.h b/src/help.h index 69852b3..b6bfb21 100644 --- a/src/help.h +++ b/src/help.h @@ -23,12 +23,14 @@ #include <QPair> #include <QStringList> #include <QTextStream> +#include <cstddef> namespace help { typedef QStringList prelude_t; typedef QPair<QString, QString> params_elem_t; typedef QList<params_elem_t> params_t; typedef QPair<prelude_t, params_t> data_t; + typedef QPair<QString, QString> string_split_t; /* Builds a prelude_t object. Values are hardcoded here. */ prelude_t build_prelude (); @@ -43,6 +45,17 @@ namespace help { prelude_t cleanup_prelude (prelude_t prelude); params_t cleanup_params (params_t params); + /* + * Splits a string into two component. + * The first component is at most max_length (or 200) characters long. + * The string is split on the nearest space surrounding max_length + * (or max_length itself.) + * Caveat: if the string length is less than max_length, no splitting + * is performed. + * In that case, the second component is empty. + */ + string_split_t split_long_line (QString &line, std::ptrdiff_t max_length = 200); + /* Prints a help_data_t structure. */ QString pretty_print (); QString pretty_print (data_t data); -- 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 739e2e1cc31e9b662db568417ae8a27fbc3a7bb8 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 23 23:26:04 2015 +0200 helpdialog.cpp: try harder to set a monospaced font. --- debian/changelog | 1 + src/helpdialog.cpp | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1be98b7..d993c2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -299,6 +299,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - helpdialog.cpp: use QT_VERSION macro to select either a monospaced or typewriter font (Qt < 4.7.0 only supports TypeWriter.) - x2goutils.{cpp,h}: add new font_is_monospaced() helper. + - helpdialog.cpp: try harder to set a monospaced font. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/helpdialog.cpp b/src/helpdialog.cpp index 3fa478f..4a1936f 100644 --- a/src/helpdialog.cpp +++ b/src/helpdialog.cpp @@ -18,18 +18,33 @@ #include <QtGlobal> #include "helpdialog.h" +#include "x2goutils.h" HelpDialog::HelpDialog (QWidget *parent): QDialog (parent) { setupUi (this); } void HelpDialog::setText (QString text) { + /* Try real hard to get a monospaced font. */ QFont font ("monospace"); + + if (!font_is_monospaced (font)) { #if QT_VERSION >= 0x040700 - font.setStyleHint (QFont::Monospace); + font.setStyleHint (QFont::Monospace); #else - font.setStyleHint (QFont::TypeWriter); + font.setStyleHint (QFont::TypeWriter); #endif + } + + if (!font_is_monospaced (font)) { + font.setFamily ("Courier New"); + } + + if (!font_is_monospaced (font)) { + font.setFamily ("Courier"); + } + + /* If the font is not monospaced by now, there's not much else we can do... */ plainTextEdit->setFont (font); plainTextEdit->setTabStopWidth (30); -- 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 3d5821802240c81a7bcfa263f94ae2b9af4435c1 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Apr 24 01:08:39 2015 +0200 help.{cpp,h}: add a boolean terminal_output parameter to the pretty_print() function family. Controls terminal width auto-detection and automatic printing to stderr. --- debian/changelog | 3 +++ src/help.cpp | 30 +++++++++++++++++------------- src/help.h | 12 +++++++++--- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5b9ad08..e7a6516 100644 --- a/debian/changelog +++ b/debian/changelog @@ -307,6 +307,9 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low split_long_line() function. Use this in pretty_print(). - help.cpp: simplify pretty_print() and make it also split lines for non-terminal output or when the terminal width is unknown. + - help.{cpp,h}: add a boolean terminal_output parameter to the + pretty_print() function family. Controls terminal width auto-detection + and automatic printing to stderr. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/help.cpp b/src/help.cpp index 6b95732..f5871be 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -181,11 +181,11 @@ help::string_split_t help::split_long_line (QString &line, std::ptrdiff_t max_le return (ret); } -QString help::pretty_print () { - return (help::pretty_print (help::build_data ())); +QString help::pretty_print (bool terminal_output) { + return (help::pretty_print (help::build_data (), terminal_output)); } -QString help::pretty_print (help::data_t data) { +QString help::pretty_print (help::data_t data, bool terminal_output) { QString ret = ""; QTextStream out (&ret); out << data.first.join ("\n") << "\n"; @@ -199,19 +199,21 @@ QString help::pretty_print (help::data_t data) { std::size_t terminal_cols = 0; + if (terminal_output) { #ifdef Q_OS_WIN - CONSOLE_SCREEN_BUFFER_INFO terminal_internal; - HANDLE stderr_handle = GetStdHandle (STD_ERROR_HANDLE); - if (stderr_handle && (stderr_handle != INVALID_HANDLE_VALUE)) { - if (GetConsoleScreenBufferInfo (stderr_handle, &terminal_internal)) { - terminal_cols = (terminal_internal.srWindow.Right - terminal_internal.srWindow.Left) + 1; + CONSOLE_SCREEN_BUFFER_INFO terminal_internal; + HANDLE stderr_handle = GetStdHandle (STD_ERROR_HANDLE); + if (stderr_handle && (stderr_handle != INVALID_HANDLE_VALUE)) { + if (GetConsoleScreenBufferInfo (stderr_handle, &terminal_internal)) { + terminal_cols = (terminal_internal.srWindow.Right - terminal_internal.srWindow.Left) + 1; + } } - } #elif defined (Q_OS_UNIX) - struct winsize terminal_internal; - ioctl (0, TIOCGWINSZ, &terminal_internal); - terminal_cols = terminal_internal.ws_col; + struct winsize terminal_internal; + ioctl (0, TIOCGWINSZ, &terminal_internal); + terminal_cols = terminal_internal.ws_col; #endif + } x2goDebug << "Terminal cols: " << terminal_cols << endl; @@ -288,7 +290,9 @@ QString help::pretty_print (help::data_t data) { } } - qCritical ().nospace () << qPrintable (ret); + if (terminal_output) { + qCritical ().nospace () << qPrintable (ret); + } return (ret); } diff --git a/src/help.h b/src/help.h index b6bfb21..3a9c24d 100644 --- a/src/help.h +++ b/src/help.h @@ -56,9 +56,15 @@ namespace help { */ string_split_t split_long_line (QString &line, std::ptrdiff_t max_length = 200); - /* Prints a help_data_t structure. */ - QString pretty_print (); - QString pretty_print (data_t data); + /* + * Returns a help_data_t structure as a QString. + * If terminal_output is true, the terminal width is probed for and the function + * family tries its best to adhere to the auto-detected width. + * Additionally, terminal_output controls whether the resulting string is + * printed to stderr or not. + */ + QString pretty_print (bool terminal_output = true); + QString pretty_print (data_t data, bool terminal_output = true); } #endif /* !defined (HELP_H) */ -- 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 dbaba2f174a6166accd77bd9d68ced414cf690d0 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Apr 24 00:56:48 2015 +0200 help.cpp: simplify pretty_print() and make it also split lines for non-terminal output or when the terminal width is unknown. --- debian/changelog | 2 ++ src/help.cpp | 54 +++++++++++++++++++++++++++--------------------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index dbe7eaf..5b9ad08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -305,6 +305,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - help.cpp: typo fix for --git-info. - help.{cpp,h}: provide string splitting logic as separate split_long_line() function. Use this in pretty_print(). + - help.cpp: simplify pretty_print() and make it also split lines for + non-terminal output or when the terminal width is unknown. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/help.cpp b/src/help.cpp index 78bef9e..12a1264 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -249,41 +249,41 @@ QString help::pretty_print (help::data_t data) { remaining = terminal_cols; indent = 0; } + } - QString working_copy (*desc_split_it); + QString working_copy (*desc_split_it); - while (!working_copy.isEmpty ()) { - cur_len = working_copy.size (); - x2goDebug << "Trying to fit a (remaining) description " << cur_len << " characters wide." << endl; + while (!working_copy.isEmpty ()) { + cur_len = working_copy.size (); + x2goDebug << "Trying to fit a (remaining) description " << cur_len << " characters wide." << endl; - string_split_t string_split = split_long_line (working_copy, remaining); - working_copy = string_split.first; + string_split_t string_split; - /* Print potentially splitted line. */ - out << working_copy; + if (0 != terminal_cols) { + string_split = split_long_line (working_copy, remaining); + } + else { + /* For non-terminal printing (or if the width is unknown), use the default splitting length. */ + string_split = split_long_line (working_copy); + } - /* Continue with next chunk. */ - working_copy = string_split.second;; + /* Print potentially splitted line. */ + working_copy = string_split.first; + out << working_copy; - /* Print whitespace if the remainder string is non-empty. */ - if (!working_copy.isEmpty ()) { - out << "\n"; - indent = terminal_cols - remaining; - out << QString (" ").repeated (indent); - } - } - } - else { - /* No idea what the terminal size is. Just print it all onto one line. */ - out << (*desc_split_it); - } + /* Continue with next chunk. */ + working_copy = string_split.second;; - out << "\n"; + out << "\n"; - /* Add whitespace if description shall continue on next line. */ - if ((desc_split_it + 1) != desc_split.constEnd ()) { - indent = 2 + max_len + 4; - out << QString (" ").repeated (indent); + /* + * Print whitespace if the remainder string is non-empty + * or printing shall continue on next line. + */ + if ((!working_copy.isEmpty ()) || ((desc_split_it + 1) != desc_split.constEnd ())) { + indent = 2 + max_len + 4; + out << QString (" ").repeated (indent); + } } } } -- 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 d9e471602d440e8fc765d7e58bfadd630ca640fe Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Apr 24 01:31:31 2015 +0200 help.h: lower default splitting length to 100 characters. --- debian/changelog | 1 + src/help.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bd28f64..7c4673d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -312,6 +312,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low and automatic printing to stderr. - onmainwindow.cpp: don't let a potential terminal affect the help string shown in the GUI. + - help.h: lower default splitting length to 100 characters. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/help.h b/src/help.h index 3a9c24d..e05ca92 100644 --- a/src/help.h +++ b/src/help.h @@ -54,7 +54,7 @@ namespace help { * is performed. * In that case, the second component is empty. */ - string_split_t split_long_line (QString &line, std::ptrdiff_t max_length = 200); + string_split_t split_long_line (QString &line, std::ptrdiff_t max_length = 100); /* * Returns a help_data_t structure as a QString. -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git