Mercurial > octave

comparison libgui/src/main-window.cc @ 33359:689d4d069bbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use Octave coding convention of space between function name and parentheses in libgui/. * libgui/graphics/BaseControl.cc, libgui/graphics/Canvas.cc, libgui/graphics/Figure.cc, libgui/graphics/FigureWindow.cc, libgui/graphics/FigureWindow.h, libgui/graphics/QtHandlesUtils.cc, libgui/graphics/Table.h, libgui/graphics/annotation-dialog.cc, libgui/graphics/gl-select.cc, libgui/src/command-widget.cc, libgui/src/dialog.cc, libgui/src/documentation-bookmarks.cc, libgui/src/documentation.cc, libgui/src/dw-main-window.cc, libgui/src/files-dock-widget.cc, libgui/src/gui-settings.cc, libgui/src/gui-settings.h, libgui/src/gui-utils.cc, libgui/src/led-indicator.cc, libgui/src/m-editor/file-editor-tab.cc, libgui/src/m-editor/find-dialog.cc, libgui/src/m-editor/octave-qscintilla.cc, libgui/src/main-window.cc, libgui/src/main-window.h, libgui/src/octave-dock-widget.cc, libgui/src/set-path-dialog.cc, libgui/src/set-path-model.cc, libgui/src/settings-dialog.cc, libgui/src/tab-bar.cc, libgui/src/tab-bar.h, libgui/src/terminal-dock-widget.cc, libgui/src/variable-editor-model.cc, libgui/src/variable-editor-model.h, libgui/src/variable-editor.cc, libgui/src/workspace-model.h, libgui/src/workspace-view.cc: Use Octave coding convention of space between function name and parentheses.
author Rik <rik@octave.org>
date Mon, 08 Apr 2024 14:39:40 -0700
parents c8dcba6e3ed8
children ada37b7a4b28
comparison
equal deleted inserted replaced
33357:c7bd12648bc2 33359:689d4d069bbf
813 octave_value_list paths; 813 octave_value_list paths;
814 814
815 // Loop over all directories in order to get all subdirs 815 // Loop over all directories in order to get all subdirs
816 for (octave_idx_type i = 0; i < dir_list.length (); i++) 816 for (octave_idx_type i = 0; i < dir_list.length (); i++)
817 { 817 {
818 std::string dir = dir_list.at(i).toStdString (); 818 std::string dir = dir_list.at (i).toStdString ();
819 819
820 if (subdirs) 820 if (subdirs)
821 paths.append (Fgenpath (ovl (dir))); 821 paths.append (Fgenpath (ovl (dir)));
822 else 822 else
823 paths.append (dir); 823 paths.append (dir);
926 QString preferred_style = settings.string_value (global_style); 926 QString preferred_style = settings.string_value (global_style);
927 927
928 if (preferred_style == global_style.def ().toString ()) 928 if (preferred_style == global_style.def ().toString ())
929 preferred_style = m_default_style; 929 preferred_style = m_default_style;
930 930
931 QApplication *qapp = m_octave_qobj.qapplication(); 931 QApplication *qapp = m_octave_qobj.qapplication ();
932 932
933 if (preferred_style == global_extra_styles.at (EXTRA_STYLE_FUSION_DARK)) 933 if (preferred_style == global_extra_styles.at (EXTRA_STYLE_FUSION_DARK))
934 { 934 {
935 QStyle *new_style = QStyleFactory::create (QStringLiteral("Fusion")); 935 QStyle *new_style = QStyleFactory::create (QStringLiteral ("Fusion"));
936 if (new_style) 936 if (new_style)
937 qapp->setStyle (new_style); 937 qapp->setStyle (new_style);
938 qapp->setPalette (getFusionDarkPalette()); 938 qapp->setPalette (getFusionDarkPalette ());
939 qapp->setStyleSheet ("QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }"); 939 qapp->setStyleSheet ("QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }");
940 } 940 }
941 else 941 else
942 { 942 {
943 QStyle *new_style = QStyleFactory::create (preferred_style); 943 QStyle *new_style = QStyleFactory::create (preferred_style);
1024 QApplication::setCursorFlashTime (0); // no flashing 1024 QApplication::setCursorFlashTime (0); // no flashing
1025 1025
1026 } 1026 }
1027 1027
1028 QPalette 1028 QPalette
1029 main_window::getFusionDarkPalette() 1029 main_window::getFusionDarkPalette ()
1030 { 1030 {
1031 QPalette darkPalette; 1031 QPalette darkPalette;
1032 darkPalette.setColor(QPalette::Window, QColor(53, 53, 53)); 1032 darkPalette.setColor (QPalette::Window, QColor (53, 53, 53));
1033 darkPalette.setColor(QPalette::WindowText, Qt::white); 1033 darkPalette.setColor (QPalette::WindowText, Qt::white);
1034 darkPalette.setColor(QPalette::Disabled, QPalette::WindowText, QColor(127, 127, 127)); 1034 darkPalette.setColor (QPalette::Disabled, QPalette::WindowText, QColor (127, 127, 127));
1035 darkPalette.setColor(QPalette::Base, QColor(42, 42, 42)); 1035 darkPalette.setColor (QPalette::Base, QColor (42, 42, 42));
1036 darkPalette.setColor(QPalette::AlternateBase, QColor(66, 66, 66)); 1036 darkPalette.setColor (QPalette::AlternateBase, QColor (66, 66, 66));
1037 darkPalette.setColor(QPalette::ToolTipBase, Qt::white); 1037 darkPalette.setColor (QPalette::ToolTipBase, Qt::white);
1038 darkPalette.setColor(QPalette::ToolTipText, Qt::white); 1038 darkPalette.setColor (QPalette::ToolTipText, Qt::white);
1039 darkPalette.setColor(QPalette::Text, Qt::white); 1039 darkPalette.setColor (QPalette::Text, Qt::white);
1040 darkPalette.setColor(QPalette::Disabled, QPalette::Text, QColor(127, 127, 127)); 1040 darkPalette.setColor (QPalette::Disabled, QPalette::Text, QColor (127, 127, 127));
1041 darkPalette.setColor(QPalette::Dark, QColor(35, 35, 35)); 1041 darkPalette.setColor (QPalette::Dark, QColor (35, 35, 35));
1042 darkPalette.setColor(QPalette::Shadow, QColor(20, 20, 20)); 1042 darkPalette.setColor (QPalette::Shadow, QColor (20, 20, 20));
1043 darkPalette.setColor(QPalette::Button, QColor(53, 53, 53)); 1043 darkPalette.setColor (QPalette::Button, QColor (53, 53, 53));
1044 darkPalette.setColor(QPalette::ButtonText, Qt::white); 1044 darkPalette.setColor (QPalette::ButtonText, Qt::white);
1045 darkPalette.setColor(QPalette::Disabled, QPalette::ButtonText, QColor(127, 127, 127)); 1045 darkPalette.setColor (QPalette::Disabled, QPalette::ButtonText, QColor (127, 127, 127));
1046 darkPalette.setColor(QPalette::BrightText, Qt::red); 1046 darkPalette.setColor (QPalette::BrightText, Qt::red);
1047 darkPalette.setColor(QPalette::Link, QColor(42, 130, 218)); 1047 darkPalette.setColor (QPalette::Link, QColor (42, 130, 218));
1048 darkPalette.setColor(QPalette::Highlight, QColor(42, 130, 218)); 1048 darkPalette.setColor (QPalette::Highlight, QColor (42, 130, 218));
1049 darkPalette.setColor(QPalette::Disabled, QPalette::Highlight, QColor(80, 80, 80)); 1049 darkPalette.setColor (QPalette::Disabled, QPalette::Highlight, QColor (80, 80, 80));
1050 darkPalette.setColor(QPalette::HighlightedText, Qt::white); 1050 darkPalette.setColor (QPalette::HighlightedText, Qt::white);
1051 darkPalette.setColor(QPalette::Disabled, QPalette::HighlightedText, QColor(127, 127, 127)); 1051 darkPalette.setColor (QPalette::Disabled, QPalette::HighlightedText, QColor (127, 127, 127));
1052 1052
1053 return darkPalette; 1053 return darkPalette;
1054 } 1054 }
1055 1055
1056 void 1056 void
1383 1383
1384 QFileDialog fileDialog (p); 1384 QFileDialog fileDialog (p);
1385 1385
1386 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. 1386 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved.
1387 if (! settings.bool_value (global_use_native_dialogs)) 1387 if (! settings.bool_value (global_use_native_dialogs))
1388 fileDialog.setOption(QFileDialog::DontUseNativeDialog); 1388 fileDialog.setOption (QFileDialog::DontUseNativeDialog);
1389 1389
1390 fileDialog.setNameFilter (tr ("Octave Files (*.m);;All Files (*)")); 1390 fileDialog.setNameFilter (tr ("Octave Files (*.m);;All Files (*)"));
1391 1391
1392 fileDialog.setAcceptMode (QFileDialog::AcceptOpen); 1392 fileDialog.setAcceptMode (QFileDialog::AcceptOpen);
1393 fileDialog.setViewMode (QFileDialog::Detail); 1393 fileDialog.setViewMode (QFileDialog::Detail);
1394 fileDialog.setFileMode (QFileDialog::ExistingFiles); 1394 fileDialog.setFileMode (QFileDialog::ExistingFiles);
1395 fileDialog.setDirectory (m_current_directory_combo_box->itemText (0)); 1395 fileDialog.setDirectory (m_current_directory_combo_box->itemText (0));
1396 1396
1397 if (fileDialog.exec ()) 1397 if (fileDialog.exec ())
1398 { 1398 {
1399 QStringList open_file_names = fileDialog.selectedFiles(); 1399 QStringList open_file_names = fileDialog.selectedFiles ();
1400 for (int i = 0; i < open_file_names.count (); i++) 1400 for (int i = 0; i < open_file_names.count (); i++)
1401 emit open_file_signal (open_file_names.at (i), m_file_encoding, -1); 1401 emit open_file_signal (open_file_names.at (i), m_file_encoding, -1);
1402 } 1402 }
1403 } 1403 }
1404 1404
1634 { 1634 {
1635 do_reset_windows (true); 1635 do_reset_windows (true);
1636 return; 1636 return;
1637 } 1637 }
1638 1638
1639 if (isMaximized()) 1639 if (isMaximized ())
1640 { 1640 {
1641 // If the window state is restored to maximized layout, the 1641 // If the window state is restored to maximized layout, the
1642 // horizontal layout is not preserved. This cann be avoided by 1642 // horizontal layout is not preserved. This cann be avoided by
1643 // setting the geometry to the max. available geometry. However, on 1643 // setting the geometry to the max. available geometry. However, on
1644 // X11, the available geometry (excluding task bar etc.) is equal to 1644 // X11, the available geometry (excluding task bar etc.) is equal to
1651 QScreen *s = windowHandle ()->screen (); 1651 QScreen *s = windowHandle ()->screen ();
1652 QRect av_geom = s->availableGeometry (); 1652 QRect av_geom = s->availableGeometry ();
1653 setGeometry (av_geom); // Set (correct) available geometry 1653 setGeometry (av_geom); // Set (correct) available geometry
1654 1654
1655 // Force full title bar 1655 // Force full title bar
1656 setWindowFlags(Qt::WindowTitleHint 1656 setWindowFlags (Qt::WindowTitleHint
1657 | Qt::WindowMinMaxButtonsHint 1657 | Qt::WindowMinMaxButtonsHint
1658 | Qt::WindowSystemMenuHint 1658 | Qt::WindowSystemMenuHint
1659 | Qt::WindowCloseButtonHint); 1659 | Qt::WindowCloseButtonHint);
1660 } 1660 }
1661 1661
1662 if (! restoreState (settings.byte_array_value (mw_state))) 1662 if (! restoreState (settings.byte_array_value (mw_state)))
1663 { 1663 {
1664 do_reset_windows (true); 1664 do_reset_windows (true);