Commit 8b855118 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

More cleaning

parent 763530cc
...@@ -103,15 +103,6 @@ protected: ...@@ -103,15 +103,6 @@ protected:
virtual void resizeEvent( QResizeEvent * event ); virtual void resizeEvent( QResizeEvent * event );
private: private:
QSettings *settings;
QSystemTrayIcon *sysTray;
QMenu *systrayMenu;
QString input_name;
QGridLayout *mainLayout;
ControlsWidget *controls;
InputControlsWidget *inputC;
FullscreenControllerWidget *fullscreenControls;
void createMainWidget( QSettings* ); void createMainWidget( QSettings* );
void createStatusBar(); void createStatusBar();
...@@ -122,7 +113,16 @@ private: ...@@ -122,7 +113,16 @@ private:
void handleSystray(); void handleSystray();
void createSystray(); void createSystray();
void initSystray(); 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 */ /* Video */
VideoWidget *videoWidget; VideoWidget *videoWidget;
...@@ -131,6 +131,11 @@ private: ...@@ -131,6 +131,11 @@ private:
VisualSelector *visualSelector; VisualSelector *visualSelector;
PlaylistWidget *playlistWidget; PlaylistWidget *playlistWidget;
/* Status Bar */
QLabel *nameLabel;
QLabel *cryptedLabel;
/* Status and flags */
bool videoIsActive; ///< Having a video now / THEMIM->hasV bool videoIsActive; ///< Having a video now / THEMIM->hasV
bool videoEmbeddedFlag; ///< Want an external Video Window bool videoEmbeddedFlag; ///< Want an external Video Window
bool playlistVisible; ///< Is the playlist visible ? bool playlistVisible; ///< Is the playlist visible ?
...@@ -142,14 +147,9 @@ private: ...@@ -142,14 +147,9 @@ private:
QSize mainVideoSize; ///< Wnd with video (all modes) QSize mainVideoSize; ///< Wnd with video (all modes)
int i_visualmode; ///< Visual Mode int i_visualmode; ///< Visual Mode
pl_dock_e i_pl_dock; pl_dock_e i_pl_dock;
bool isDocked() { return ( i_pl_dock != PL_UNDOCKED ); }
int i_bg_height; ///< Save height of bgWidget int i_bg_height; ///< Save height of bgWidget
bool b_shouldHide; bool b_shouldHide;
/* Status Bar */
QLabel *nameLabel;
QLabel *cryptedLabel;
#ifdef WIN32 #ifdef WIN32
HIMAGELIST himl; HIMAGELIST himl;
LPTASKBARLIST3 p_taskbl; LPTASKBARLIST3 p_taskbl;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment