weld MediaPlaybackPanel

Change-Id: I84c9e6f37de3b22b896f8109e49a5a0391630ac2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87754
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 17 insertions, 31 deletions

diff --git a/avmedia/inc/bitmaps.hlst b/avmedia/inc/bitmaps.hlst
index 24441a26f688..682d090fe7b1 100644
--- a/avmedia/inc/bitmaps.hlst
+++ b/avmedia/inc/bitmaps.hlst
@@ -10,20 +10,6 @@
 #ifndef INCLUDED_AVMEDIA_INC_BITMAPS_HRC
 #define INCLUDED_AVMEDIA_INC_BITMAPS_HRC
 
-#define AVMEDIA_IMG_OPEN_NORMAL     "avmedia/res/av02048.png"
-#define AVMEDIA_IMG_PLAY_NORMAL     "avmedia/res/av02049.png"
-#define AVMEDIA_IMG_PAUSE_NORMAL    "avmedia/res/av02050.png"
-#define AVMEDIA_IMG_STOP_NORMAL     "avmedia/res/av02051.png"
-#define AVMEDIA_IMG_LOOP_NORMAL     "avmedia/res/av02052.png"
-#define AVMEDIA_IMG_INSERT_NORMAL   "avmedia/res/av02053.png"
-#define AVMEDIA_IMG_MUTE_NORMAL     "avmedia/res/av02054.png"
-#define AVMEDIA_IMG_OPEN_LARGE      "avmedia/res/avl02048.png"
-#define AVMEDIA_IMG_PLAY_LARGE      "avmedia/res/avl02049.png"
-#define AVMEDIA_IMG_PAUSE_LARGE     "avmedia/res/avl02050.png"
-#define AVMEDIA_IMG_STOP_LARGE      "avmedia/res/avl02051.png"
-#define AVMEDIA_IMG_LOOP_LARGE      "avmedia/res/avl02052.png"
-#define AVMEDIA_IMG_INSERT_LARGE    "avmedia/res/avl02053.png"
-#define AVMEDIA_IMG_MUTE_LARGE      "avmedia/res/avl02054.png"
 #define AVMEDIA_BMP_AUDIOLOGO       "avmedia/res/avaudiologo.png"
 #define AVMEDIA_BMP_EMPTYLOGO       "avmedia/res/avemptylogo.png"
 
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 9172195eea71..b67ac0a36808 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -22,17 +22,14 @@
 
 #include <avmedia/mediaitem.hxx>
 
+#include <vcl/ctrl.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
-#include <vcl/slider.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/fixed.hxx>
+#include <vcl/weld.hxx>
 #include <avmedia/MediaControlBase.hxx>
 
 #define AVMEDIA_CONTROLOFFSET 6
 
-class ListBox;
-
 namespace avmedia
 {
 
@@ -41,12 +38,11 @@ class MediaItem;
 class MediaControl : public Control, public MediaControlBase
 {
 public:
-
                         MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle );
     virtual             ~MediaControl() override;
     virtual void        dispose() override;
 
-    const Size&         getMinSizePixel() const;
+    Size                getMinSizePixel() const;
 
     void                setState( const MediaItem& rItem );
     void                UpdateURLField( MediaItem const & maItem );
@@ -58,21 +54,24 @@ protected:
 
     virtual void        Resize() override;
     virtual void        InitializeWidgets() override;
-    VclPtr<FixedText>        mpMediaPath;
+    std::unique_ptr<weld::Label> mxMediaPath;
 
 private:
 
-                        DECL_LINK( implTimeHdl, Slider*, void );
-                        DECL_LINK( implTimeEndHdl, Slider*, void );
-                        DECL_LINK( implVolumeHdl, Slider*, void );
-                        DECL_LINK( implSelectHdl, ToolBox*, void );
-                        DECL_LINK( implZoomSelectHdl, ListBox&, void );
-                        DECL_LINK(implTimeoutHdl, Timer *, void);
+                        DECL_LINK(implTimeHdl, weld::Scale&, void);
+                        DECL_LINK(implTimeEndHdl, Timer*, void);
+                        DECL_LINK(implVolumeHdl, weld::Scale&, void);
+                        DECL_LINK(implSelectHdl, const OString&, void);
+                        DECL_LINK(implZoomSelectHdl, weld::ComboBox&, void);
+                        DECL_LINK(implTimeoutHdl, Timer*, void);
+
+    std::unique_ptr<weld::Builder> m_xBuilder;
+    VclPtr<vcl::Window> m_xVclContentArea;
+    std::unique_ptr<weld::Container> m_xContainer;
 
     Idle                maIdle;
+    Idle                maChangeTimeIdle;
     MediaItem           maItem;
-    VclPtr<ToolBox>     mpZoomToolBox;
-    Size                maMinSize;
     bool                mbLocked;
     MediaControlStyle   meControlStyle;
     double mfTime;
diff --git a/avmedia/inc/strings.hrc b/avmedia/inc/strings.hrc
index cc1692a220b3..d9103dd545a1 100644
--- a/avmedia/inc/strings.hrc
+++ b/avmedia/inc/strings.hrc
@@ -44,7 +44,8 @@
 #define AVMEDIA_STR_ALL_MEDIAFILES  NC_("AVMEDIA_STR_ALL_MEDIAFILES", "All audio and video files")
 #define AVMEDIA_STR_ALL_FILES       NC_("AVMEDIA_STR_ALL_FILES", "All files")
 #define AVMEDIA_STR_ERR_URL         NC_("AVMEDIA_STR_ERR_URL", "The format of the selected file is not supported.")
+#define AVMEDIA_STR_ZOOM_TOOLTIP    NC_("AVMEDIA_STR_ZOOM_TOOLTIP", "View")
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */