Changeset 52713 in webkit


Ignore:
Timestamp:
Jan 4, 2010 12:43:22 AM (14 years ago)
Author:
dbates@webkit.org
Message:

2010-01-04 Daniel Bates <dbates@webkit.org>

Reviewed by Eric Seidel.

https://bugs.webkit.org/show_bug.cgi?id=33097

Cleans up the File menu to better conform to the File menu in Safari
both in terms of options and keyboard shortcuts. Adds a "Quit" menu
options to close all open windows.

  • QGVLauncher/main.cpp: (MainWindow::buildUI):

2010-01-04 Daniel Bates <dbates@webkit.org>

Reviewed by Eric Seidel.

https://bugs.webkit.org/show_bug.cgi?id=33097

Cleans up the File menu to better conform to the File menu in Safari
both in terms of options and keyboard shortcuts. Adds a "Quit" menu
options to close all open windows. Also, renames the Tools menu to
Develop.

  • QtLauncher/main.cpp: (MainWindow::setupUI):
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/qt/ChangeLog

    r52690 r52713  
     12010-01-04  Daniel Bates  <dbates@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=33097
     6
     7        Cleans up the File menu to better conform to the File menu in Safari
     8        both in terms of options and keyboard shortcuts. Adds a "Quit" menu
     9        options to close all open windows.
     10
     11        * QGVLauncher/main.cpp:
     12        (MainWindow::buildUI):
     13
    1142009-12-31  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
    215
  • trunk/WebKit/qt/QGVLauncher/main.cpp

    r52690 r52713  
    410410
    411411        QMenu* fileMenu = menuBar()->addMenu("&File");
    412         fileMenu->addAction("New Window", this, SLOT(newWindow()));
    413         fileMenu->addAction("Open File...", this, SLOT(openFile()), QKeySequence(Qt::CTRL | Qt::Key_O));
    414         fileMenu->addAction("Clone view", this, SLOT(clone()));
    415         fileMenu->addAction("Close", this, SLOT(close()));
     412        fileMenu->addAction("New Window", this, SLOT(newWindow()), QKeySequence::New);
     413        fileMenu->addAction("Open File...", this, SLOT(openFile()), QKeySequence::Open);
     414        fileMenu->addAction("Clone Window", this, SLOT(clone()));
     415        fileMenu->addAction("Close Window", this, SLOT(close()), QKeySequence::Close);
     416        fileMenu->addSeparator();
     417        fileMenu->addAction("Quit", QApplication::instance(), SLOT(closeAllWindows()), QKeySequence(Qt::CTRL | Qt::Key_Q));
    416418
    417419        QMenu* viewMenu = menuBar()->addMenu("&View");
  • trunk/WebKitTools/ChangeLog

    r52712 r52713  
     12010-01-04  Daniel Bates  <dbates@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=33097
     6
     7        Cleans up the File menu to better conform to the File menu in Safari
     8        both in terms of options and keyboard shortcuts. Adds a "Quit" menu
     9        options to close all open windows. Also, renames the Tools menu to
     10        Develop.
     11
     12        * QtLauncher/main.cpp:
     13        (MainWindow::setupUI):
     14
    1152010-01-04  Daniel Bates  <dbates@webkit.org>
    216
  • trunk/WebKitTools/QtLauncher/main.cpp

    r52626 r52713  
    539539
    540540        QMenu* fileMenu = menuBar()->addMenu("&File");
    541         QAction* newWindow = fileMenu->addAction("New Window", this, SLOT(newWindow()));
    542         fileMenu->addAction(tr("Open File..."), this, SLOT(openFile()), QKeySequence(Qt::CTRL | Qt::Key_O));
    543         fileMenu->addAction(tr("Print"), this, SLOT(print()), QKeySequence::Print);
    544         QAction* screenshot = fileMenu->addAction("Screenshot", this, SLOT(screenshot()));
    545         fileMenu->addAction("Close", this, SLOT(close()));
     541        fileMenu->addAction("New Window", this, SLOT(newWindow()), QKeySequence::New);
     542        fileMenu->addAction(tr("Open File..."), this, SLOT(openFile()), QKeySequence::Open);
     543        fileMenu->addAction("Close Window", this, SLOT(close()), QKeySequence::Close);
     544        fileMenu->addSeparator();
     545        fileMenu->addAction("Take Screen Shot...", this, SLOT(screenshot()));
     546        fileMenu->addAction(tr("Print..."), this, SLOT(print()), QKeySequence::Print);
     547        fileMenu->addSeparator();
     548        fileMenu->addAction("Quit", QApplication::instance(), SLOT(closeAllWindows()), QKeySequence(Qt::CTRL | Qt::Key_Q));
    546549
    547550        QMenu* editMenu = menuBar()->addMenu("&Edit");
     
    581584        writingMenu->addAction(view->pageAction(QWebPage::SetTextDirectionRightToLeft));
    582585
    583         newWindow->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_N));
    584         screenshot->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_S));
    585586        view->pageAction(QWebPage::Back)->setShortcut(QKeySequence::Back);
    586587        view->pageAction(QWebPage::Stop)->setShortcut(Qt::Key_Escape);
     
    599600        view->pageAction(QWebPage::ToggleUnderline)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_U));
    600601
    601         QMenu* toolsMenu = menuBar()->addMenu("&Tools");
    602         toolsMenu->addAction("Select elements...", this, SLOT(selectElements()));
    603         QAction* showInspectorAction = toolsMenu->addAction("Show inspector", inspector, SLOT(setVisible(bool)));
     602        QMenu* toolsMenu = menuBar()->addMenu("&Develop");
     603        toolsMenu->addAction("Select Elements...", this, SLOT(selectElements()));
     604        QAction* showInspectorAction = toolsMenu->addAction("Show Web Inspector", inspector, SLOT(setVisible(bool)), QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_I));
    604605        showInspectorAction->setCheckable(true);
    605         showInspectorAction->setShortcuts(QList<QKeySequence>() << QKeySequence(tr("F12")));
    606606        showInspectorAction->connect(inspector, SIGNAL(visibleChanged(bool)), SLOT(setChecked(bool)));
    607607
Note: See TracChangeset for help on using the changeset viewer.