Mercurial > octave-nkf

diff libgui/src/history-dock-widget.cc @ 17790:86c6ae5f969e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use GNU style coding conventions for code in libgui/ * libgui/qterminal/libqterminal/QTerminal.h, libgui/src/color-picker.cc, libgui/src/color-picker.h, libgui/src/dialog.cc, libgui/src/dialog.h, libgui/src/documentation-dock-widget.cc, libgui/src/files-dock-widget.cc, libgui/src/files-dock-widget.h, libgui/src/find-files-dialog.cc, libgui/src/find-files-dialog.h, libgui/src/find-files-model.cc, libgui/src/find-files-model.h, libgui/src/history-dock-widget.cc, libgui/src/history-dock-widget.h, libgui/src/m-editor/file-editor-interface.h, libgui/src/m-editor/file-editor-tab.cc, libgui/src/m-editor/file-editor-tab.h, libgui/src/m-editor/file-editor.cc, libgui/src/m-editor/find-dialog.cc, libgui/src/m-editor/find-dialog.h, libgui/src/m-editor/octave-qscintilla.cc, libgui/src/main-window.cc, libgui/src/main-window.h, libgui/src/news-dock-widget.h, libgui/src/octave-dock-widget.cc, libgui/src/octave-dock-widget.h, libgui/src/octave-gui.cc, libgui/src/octave-qt-link.cc, libgui/src/octave-qt-link.h, libgui/src/qtinfo/parser.cc, libgui/src/qtinfo/parser.h, libgui/src/qtinfo/webinfo.cc, libgui/src/qtinfo/webinfo.h, libgui/src/resource-manager.cc, libgui/src/settings-dialog.cc, libgui/src/settings-dialog.h, libgui/src/terminal-dock-widget.cc, libgui/src/welcome-wizard.cc, libgui/src/workspace-model.cc, libgui/src/workspace-model.h, libgui/src/workspace-view.cc, libgui/src/workspace-view.h: Use GNU style coding conventions for code in libgui/
author Rik <rik@octave.org>
date Tue, 29 Oct 2013 09:54:40 -0700
parents d63878346099
children 752f6b358754
line wrap: on
line diff
--- a/libgui/src/history-dock-widget.cc	Mon Oct 28 20:49:13 2013 -0700
+++ b/libgui/src/history-dock-widget.cc	Tue Oct 29 09:54:40 2013 -0700
@@ -63,16 +63,20 @@
   _history_list_view->setModel (&_sort_filter_proxy_model);
   _history_list_view->setAlternatingRowColors (true);
   _history_list_view->setEditTriggers (QAbstractItemView::NoEditTriggers);
-  _history_list_view->setStatusTip (tr ("Doubleclick a command to transfer it to the terminal."));
+  _history_list_view->setStatusTip (
+    tr ("Doubleclick a command to transfer it to the terminal."));
   _history_list_view->setSelectionMode (QAbstractItemView::ExtendedSelection);
-  _history_list_view->setContextMenuPolicy(Qt::CustomContextMenu);
-  connect(_history_list_view, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(ctxMenu(const QPoint &)));
+  _history_list_view->setContextMenuPolicy (Qt::CustomContextMenu);
+  connect (_history_list_view,
+           SIGNAL (customContextMenuRequested (const QPoint &)), this,
+           SLOT (ctxMenu (const QPoint &)));
 
   _filter_line_edit = new QLineEdit (this);
-  _filter_line_edit->setStatusTip (tr ("Enter text to filter the command history."));
+  _filter_line_edit->setStatusTip (
+    tr ("Enter text to filter the command history."));
   QVBoxLayout *vbox_layout = new QVBoxLayout ();
 
-  setWindowIcon (QIcon(":/actions/icons/logo.png"));
+  setWindowIcon (QIcon (":/actions/icons/logo.png"));
   set_title (tr ("Command History"));
   setWidget (new QWidget ());
 
@@ -91,43 +95,46 @@
   setFocusProxy (_filter_line_edit);
 }
 
-void history_dock_widget::ctxMenu(const QPoint &xpos) {
-    QMenu menu(this);
-    menu.addAction(tr("Copy"), this, SLOT(handle_contextmenu_copy(bool)));
-    menu.addAction(tr("Evaluate"), this, SLOT(handle_contextmenu_evaluate(bool)));
-    menu.addAction(tr("Create script"), this, SLOT(handle_contextmenu_create_script(bool)));
-    menu.exec(_history_list_view->mapToGlobal(xpos));
+void history_dock_widget::ctxMenu (const QPoint &xpos)
+{
+  QMenu menu (this);
+  menu.addAction (tr ("Copy"), this, SLOT (handle_contextmenu_copy (bool)));
+  menu.addAction (tr ("Evaluate"), this,
+                  SLOT (handle_contextmenu_evaluate (bool)));
+  menu.addAction (tr ("Create script"), this,
+                  SLOT (handle_contextmenu_create_script (bool)));
+  menu.exec (_history_list_view->mapToGlobal (xpos));
 }
 
-void history_dock_widget::handle_contextmenu_copy(bool)
+void history_dock_widget::handle_contextmenu_copy (bool)
 {
   QString text;
-  QItemSelectionModel *selectionModel = _history_list_view->selectionModel();
-  QModelIndexList rows = selectionModel->selectedRows();
+  QItemSelectionModel *selectionModel = _history_list_view->selectionModel ();
+  QModelIndexList rows = selectionModel->selectedRows ();
   QModelIndexList::iterator it;
   bool prev_valid_row = false;
-  for (it = rows.begin(); it != rows.end(); it++)
+  for (it = rows.begin (); it != rows.end (); it++)
     {
-      if ((*it).isValid())
+      if ((*it).isValid ())
         {
           if (prev_valid_row)
             text += "\n";
-          text += (*it).data().toString();
+          text += (*it).data ().toString ();
           prev_valid_row = true;
         }
     }
-  QApplication::clipboard()->setText(text);
+  QApplication::clipboard ()->setText (text);
 }
 
-void history_dock_widget::handle_contextmenu_evaluate(bool)
+void history_dock_widget::handle_contextmenu_evaluate (bool)
 {
-  QItemSelectionModel *selectionModel = _history_list_view->selectionModel();
-  QModelIndexList rows = selectionModel->selectedRows();
+  QItemSelectionModel *selectionModel = _history_list_view->selectionModel ();
+  QModelIndexList rows = selectionModel->selectedRows ();
   QModelIndexList::iterator it;
-  for (it = rows.begin() ; it != rows.end(); it++)
+  for (it = rows.begin () ; it != rows.end (); it++)
     {
-      if ((*it).isValid())
-        emit command_double_clicked ((*it).data().toString());
+      if ((*it).isValid ())
+        emit command_double_clicked ((*it).data ().toString ());
     }
 }
 
@@ -145,7 +152,7 @@
         {
           if (prev_valid_row)
             text += "\n";
-          text += (*it).data().toString();
+          text += (*it).data ().toString ();
           prev_valid_row = true;
         }
     }
@@ -158,7 +165,7 @@
 void
 history_dock_widget::handle_double_click (QModelIndex modelIndex)
 {
-  emit command_double_clicked (modelIndex.data().toString());
+  emit command_double_clicked (modelIndex.data ().toString ());
 }
 
 void
@@ -194,9 +201,9 @@
 void
 history_dock_widget::copyClipboard ()
 {
-  if(_history_list_view->hasFocus())
-    handle_contextmenu_copy(true);
-  if(_filter_line_edit->hasFocus () && _filter_line_edit->hasSelectedText ())
+  if (_history_list_view->hasFocus ())
+    handle_contextmenu_copy (true);
+  if (_filter_line_edit->hasFocus () && _filter_line_edit->hasSelectedText ())
     {
       QClipboard *clipboard = QApplication::clipboard ();
       clipboard->setText ( _filter_line_edit->selectedText ());
@@ -206,11 +213,11 @@
 void
 history_dock_widget::pasteClipboard ()
 {
-  if(_filter_line_edit->hasFocus ())
+  if (_filter_line_edit->hasFocus ())
     {
       QClipboard *clipboard = QApplication::clipboard ();
       QString str =  clipboard->text ();
-      if (str.length() > 0)
+      if (str.length () > 0)
         _filter_line_edit->insert (str);
     }
 }