[vlc-devel] commit: More cleaning (Jean-Baptiste Kempf )
git version control
git at videolan.org
Thu Oct 1 22:19:13 CEST 2009
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Oct 1 20:06:34 2009 +0200| [8b855118289cf0dd99a26b8763ded6e7bbd4447d] | committer: Jean-Baptiste Kempf
More cleaning
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8b855118289cf0dd99a26b8763ded6e7bbd4447d
---
modules/gui/qt4/main_interface.hpp | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 10db367..00483ab 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -103,15 +103,6 @@ protected:
virtual void resizeEvent( QResizeEvent * event );
private:
- QSettings *settings;
- QSystemTrayIcon *sysTray;
- QMenu *systrayMenu;
- QString input_name;
- QGridLayout *mainLayout;
- ControlsWidget *controls;
- InputControlsWidget *inputC;
- FullscreenControllerWidget *fullscreenControls;
-
void createMainWidget( QSettings* );
void createStatusBar();
@@ -122,7 +113,16 @@ private:
void handleSystray();
void createSystray();
void initSystray();
+ bool isDocked() { return ( i_pl_dock != PL_UNDOCKED ); }
+ QSettings *settings;
+ QSystemTrayIcon *sysTray;
+ QMenu *systrayMenu;
+ QString input_name;
+ QGridLayout *mainLayout;
+ ControlsWidget *controls;
+ InputControlsWidget *inputC;
+ FullscreenControllerWidget *fullscreenControls;
/* Video */
VideoWidget *videoWidget;
@@ -131,6 +131,11 @@ private:
VisualSelector *visualSelector;
PlaylistWidget *playlistWidget;
+ /* Status Bar */
+ QLabel *nameLabel;
+ QLabel *cryptedLabel;
+
+ /* Status and flags */
bool videoIsActive; ///< Having a video now / THEMIM->hasV
bool videoEmbeddedFlag; ///< Want an external Video Window
bool playlistVisible; ///< Is the playlist visible ?
@@ -142,14 +147,9 @@ private:
QSize mainVideoSize; ///< Wnd with video (all modes)
int i_visualmode; ///< Visual Mode
pl_dock_e i_pl_dock;
- bool isDocked() { return ( i_pl_dock != PL_UNDOCKED ); }
int i_bg_height; ///< Save height of bgWidget
bool b_shouldHide;
- /* Status Bar */
- QLabel *nameLabel;
- QLabel *cryptedLabel;
-
#ifdef WIN32
HIMAGELIST himl;
LPTASKBARLIST3 p_taskbl;
More information about the vlc-devel
mailing list