kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-20 16:20:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

La reduction dans le systray tient desormais compte des barres d'outils et docks flottants.

Browse Source 
Ajout d'un menu permettant de choisir les barres d'outils et docks affiches dans l'editeur d'element.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@131 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavierqet
2007-09-21 18:59:43 +00:00
parent 2ad6c27998
commit 4ee7fbdb47
4 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editor/qetelementeditor.cpp
View File

@@ -169,10 +169,17 @@ void QETElementEditor::setupMenus() {
edit_menu -> addAction(edit_size_hs); edit_menu -> addAction(edit_size_hs);
edit_menu -> addAction(edit_ori); edit_menu -> addAction(edit_ori);
// menu Affichage > Afficher
QMenu *display_toolbars = createPopupMenu();
display_toolbars -> setTearOffEnabled(true);
display_toolbars -> setTitle(tr("Afficher"));
display_menu -> addMenu(display_toolbars);
menuBar() -> addMenu(file_menu); menuBar() -> addMenu(file_menu);
menuBar() -> addMenu(edit_menu); menuBar() -> addMenu(edit_menu);
/*
menuBar() -> addMenu(display_menu); menuBar() -> addMenu(display_menu);
/*
menuBar() -> addMenu(tools_menu); menuBar() -> addMenu(tools_menu);
menuBar() -> addMenu(help_menu); menuBar() -> addMenu(help_menu);
*/ */

1
elementspanel.cpp
View File

@@ -78,7 +78,6 @@ void ElementsPanel::dropEvent(QDropEvent */*e*/) {
/** /**
Gere le debut des drag'n drop Gere le debut des drag'n drop
@param supportedActions Les actions supportees @param supportedActions Les actions supportees
@todo virer les lignes type «if ("tel appareil") construire TelAppareil» => trouver un moyen d'automatiser ca
*/ */
void ElementsPanel::startDrag(Qt::DropActions /*supportedActions*/) { void ElementsPanel::startDrag(Qt::DropActions /*supportedActions*/) {
// recupere le nom du fichier decrivant l'element // recupere le nom du fichier decrivant l'element

20
qetapp.cpp
View File

@@ -243,10 +243,28 @@ void QETApp::setMainWindowVisible(QMainWindow *window, bool visible) {
window_geometries.insert(window, window -> saveGeometry()); window_geometries.insert(window, window -> saveGeometry());
window_states.insert(window, window -> saveState()); window_states.insert(window, window -> saveState());
window -> hide(); window -> hide();
/// @todo cacher aussi les toolbars et les docks ? // cache aussi les toolbars et les docks
foreach (QWidget *qw, floatingToolbarsAndDocksForMainWindow(window)) {
qw -> hide();
}
} else { } else {
window -> show(); window -> show();
window -> restoreGeometry(window_geometries[window]); window -> restoreGeometry(window_geometries[window]);
window -> restoreState(window_states[window]); window -> restoreState(window_states[window]);
} }
} }
/**
@param window fenetre dont il faut trouver les barres d'outils et dock flottants
@return les barres d'outils et dock flottants de la fenetre
*/
QList<QWidget *> QETApp::floatingToolbarsAndDocksForMainWindow(QMainWindow *window) const {
QList<QWidget *> widgets;
foreach(QWidget *qw, topLevelWidgets()) {
if (!qw -> isWindow()) continue;
if (qobject_cast<QToolBar *>(qw) || qobject_cast<QDockWidget *>(qw)) {
if (qw -> parent() == window) widgets << qw;
}
}
return(widgets);
}

1
qetapp.h
View File

@@ -62,6 +62,7 @@ class QETApp : public QApplication {
private: private:
QList<QETDiagramEditor *> diagramEditors() const; QList<QETDiagramEditor *> diagramEditors() const;
QList<QETElementEditor *> elementEditors() const; QList<QETElementEditor *> elementEditors() const;
QList<QWidget *> floatingToolbarsAndDocksForMainWindow(QMainWindow *) const;
void setMainWindowVisible(QMainWindow *, bool); void setMainWindowVisible(QMainWindow *, bool);
}; };
#endif #endif