Compact GUI design, new features, combined widgets, editable text fields, movable docks, and more...

avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp

@@ -154,6 +154,26 @@ void UI_SetCurrentFormat( uint32_t f )
 {
 	cliFormat=f;
 }
+bool UI_getCurrentTime(uint32_t *hh, uint32_t *mm, uint32_t *ss, uint32_t *ms, uint32_t *us)
+{
+    return false;
+}
+bool UI_getMarkerA(uint32_t *hh, uint32_t *mm, uint32_t *ss, uint32_t *ms, uint32_t *us)
+{
+    return false;
+}
+bool UI_getMarkerB(uint32_t *hh, uint32_t *mm, uint32_t *ss, uint32_t *ms, uint32_t *us)
+{
+    return false;
+}
+bool UI_getSelectionTime(uint32_t *hh, uint32_t *mm, uint32_t *ss, uint32_t *ms, uint32_t *us)
+{
+    return false;
+}
+bool UI_getTotalTime(uint32_t *hh, uint32_t *mm, uint32_t *ss, uint32_t *ms, uint32_t *us)
+{
+    return false;
+}
 void UI_setCurrentTime(uint64_t x)
 {
 

avidemux/common/ADM_commonUI/DIA_gototime.cpp

@@ -25,19 +25,23 @@
  * @param ms
  * @return 
  */
-uint8_t DIA_gotoTime(uint32_t *hh, uint32_t *mm, uint32_t *ss,uint32_t *ms)
+uint8_t DIA_gotoTime(uint32_t *hh, uint32_t *mm, uint32_t *ss,uint32_t *ms, const char *title)
 {
 uint32_t v=(*hh)*3600*1000+(*mm)*60*1000+(*ss)*1000+*ms;
 uint32_t max=(uint32_t)(video_body->getVideoDuration()/1000);
 
 diaElemTimeStamp eh(&v,QT_TRANSLATE_NOOP("adm","TimeStamp:"),0,max);
 diaElem *allWidgets[]={&eh};
 
-  if(!diaFactoryRun(QT_TRANSLATE_NOOP("adm","Go to Time"),1,allWidgets)) return 0;
+  if(!diaFactoryRun(QT_TRANSLATE_NOOP("adm", title),1,allWidgets)) return 0;
 
 //
 ms2time(v,hh,mm,ss,ms);
 return 1;
 
+}
+uint8_t DIA_gotoTime(uint32_t *hh, uint32_t *mm, uint32_t *ss,uint32_t *ms)
+{
+    return DIA_gotoTime(hh, mm, ss, ms, "Go to Time");
 }
 // EOF

avidemux/common/ADM_commonUI/DIA_prefs.cpp

@@ -48,6 +48,14 @@ uint32_t olddevice,newdevice;
 uint32_t render;
 
 bool     useSwap=0;
+bool     showExtraButtons=0;
+bool     showPTSToolTips=0;
+
+bool     isCurrentTimeFieldEditable=0;
+bool     isTotalTimeFieldEditable=0;
+bool     isSelectionTimeFieldEditable=0;
+bool     isMarkerATimeFieldEditable=0;
+bool     isMarkerBTimeFieldEditable=0;
 
 uint32_t lavcThreads=0;
 uint32_t encodePriority=2;
@@ -261,6 +269,20 @@ std::string currentSdlDriver=getSdlDriverName();
         // SWAP A&B if A>B
         if(!prefs->get(FEATURES_SWAP_IF_A_GREATER_THAN_B, &useSwap))
                 useSwap=0;
+        if(!prefs->get(FEATURES_TIME_FIELDS_EXTRA_BUTTONS, &showExtraButtons))
+                showExtraButtons=0;
+        if(!prefs->get(FEATURES_PTS_TIMINGS_TOOLTIPS, &showPTSToolTips))
+                showPTSToolTips=0;
+        if(!prefs->get(FEATURES_CURRENT_TIME_FIELD_EDITABLE, &isCurrentTimeFieldEditable))
+                isCurrentTimeFieldEditable=0;
+        if(!prefs->get(FEATURES_TOTAL_TIME_FIELD_EDITABLE, &isTotalTimeFieldEditable))
+                isTotalTimeFieldEditable=0;
+        if(!prefs->get(FEATURES_SELECTION_TIME_FIELD_EDITABLE, &isSelectionTimeFieldEditable))
+                isSelectionTimeFieldEditable=0;
+        if(!prefs->get(FEATURES_MARKER_A_TIME_FIELD_EDITABLE, &isMarkerATimeFieldEditable))
+                isMarkerATimeFieldEditable=0;
+        if(!prefs->get(FEATURES_MARKER_B_TIME_FIELD_EDITABLE, &isMarkerBTimeFieldEditable))
+                isMarkerBTimeFieldEditable=0;
         // Get level of message verbosity
         prefs->get(MESSAGE_LEVEL,&msglevel);
         // Downmix default
@@ -279,6 +301,22 @@ std::string currentSdlDriver=getSdlDriverName();
         diaElemToggle swapMarkers(&useSwap,QT_TRANSLATE_NOOP("adm","_Swap markers if marker A is set past marker B or marker B before A in video"));
         diaElemToggle checkForUpdate(&doAutoUpdate,QT_TRANSLATE_NOOP("adm","_Check for new release"));
 
+        // Time Fields
+        diaElemFrame frameTimeFields(QT_TRANSLATE_NOOP("adm","Time Fields"));
+        diaElemToggle extraButtons(&showExtraButtons,QT_TRANSLATE_NOOP("adm","Show e_xtra buttons in time fields"));
+        diaElemToggle ptsToolTips(&showPTSToolTips,QT_TRANSLATE_NOOP("adm","Show _precision timings in time fields tooltips"));
+        diaElemToggle currentTimeFieldEdits(&isCurrentTimeFieldEditable,QT_TRANSLATE_NOOP("adm","Allow to keyboard edit the c_urrent time field"));
+        diaElemToggle totalTimeFieldEdits(&isTotalTimeFieldEditable,QT_TRANSLATE_NOOP("adm","Allow to keyboard edit the t_otal time field"));
+        diaElemToggle selectionTimeFieldEdits(&isSelectionTimeFieldEditable,QT_TRANSLATE_NOOP("adm","Allow to keyboard edit the selection _duration field"));
+        diaElemToggle markerATimeFieldEdits(&isMarkerATimeFieldEditable,QT_TRANSLATE_NOOP("adm","Allow to keyboard edit the Marker _A time field"));
+        diaElemToggle markerBTimeFieldEdits(&isMarkerBTimeFieldEditable,QT_TRANSLATE_NOOP("adm","Allow to keyboard edit the Marker _B time field"));
+        frameTimeFields.swallow(&extraButtons);
+        frameTimeFields.swallow(&ptsToolTips);
+        frameTimeFields.swallow(&currentTimeFieldEdits);
+        frameTimeFields.swallow(&totalTimeFieldEdits);
+        frameTimeFields.swallow(&selectionTimeFieldEdits);
+        frameTimeFields.swallow(&markerATimeFieldEdits);
+        frameTimeFields.swallow(&markerBTimeFieldEdits);
 
         diaElemFrame frameSimd(QT_TRANSLATE_NOOP("adm","SIMD"));
 
@@ -539,7 +577,7 @@ std::string currentSdlDriver=getSdlDriverName();
 //--
 #define NB_ELEM(x) sizeof(x)/sizeof(diaElem *)
         /* User Interface */
-        diaElem *diaUser[]={&menuMessage, &menuLanguage, &resetEncoder, &enableAltShortcuts, &swapUpDownKeys, &swapMouseWheel, &swapMarkers, &checkForUpdate};
+        diaElem *diaUser[]={&menuMessage, &menuLanguage, &resetEncoder, &enableAltShortcuts, &swapUpDownKeys, &swapMouseWheel, &swapMarkers, &checkForUpdate, &frameTimeFields};
         diaElemTabs tabUser(QT_TRANSLATE_NOOP("adm","User Interface"),NB_ELEM(diaUser),diaUser);
 
          /* Automation */
@@ -812,6 +850,21 @@ std::string currentSdlDriver=getSdlDriverName();
 
             // Auto swap A/B vs reset the other marker
             prefs->set(FEATURES_SWAP_IF_A_GREATER_THAN_B, useSwap);
+            // Show extra buttons in time fields
+            prefs->set(FEATURES_TIME_FIELDS_EXTRA_BUTTONS, showExtraButtons);
+            // Show precision timings in time fields tooltips
+            prefs->set(FEATURES_PTS_TIMINGS_TOOLTIPS, showPTSToolTips);
+            // Allow to keyboard edit the current time field
+            prefs->set(FEATURES_CURRENT_TIME_FIELD_EDITABLE, isCurrentTimeFieldEditable);
+            // Allow to keyboard edit the total time field
+            prefs->set(FEATURES_TOTAL_TIME_FIELD_EDITABLE, isTotalTimeFieldEditable);
+            // Allow to keyboard edit the selection duration field
+            prefs->set(FEATURES_SELECTION_TIME_FIELD_EDITABLE, isSelectionTimeFieldEditable);
+            // Allow to keyboard edit the Marker A time field
+            prefs->set(FEATURES_MARKER_A_TIME_FIELD_EDITABLE, isMarkerATimeFieldEditable);
+            // Allow to keyboard edit the Marker B time field
+            prefs->set(FEATURES_MARKER_B_TIME_FIELD_EDITABLE, isMarkerBTimeFieldEditable);
+
             //
             prefs->set(MESSAGE_LEVEL,msglevel);
             // Discard changes to output config on video load

avidemux/common/ADM_commonUI/GUI_ui.h

@@ -5,6 +5,11 @@
 void UI_updateFrameCount(uint32_t curFrame);
 void UI_setFrameCount(uint32_t curFrame,uint32_t total);
 
+bool UI_getCurrentTime(uint32_t *hh, uint32_t *mm, uint32_t *ss, uint32_t *ms, uint32_t *us);
+bool UI_getMarkerA(uint32_t *hh, uint32_t *mm, uint32_t *ss, uint32_t *ms, uint32_t *us);
+bool UI_getMarkerB(uint32_t *hh, uint32_t *mm, uint32_t *ss, uint32_t *ms, uint32_t *us);
+bool UI_getSelectionTime(uint32_t *hh, uint32_t *mm, uint32_t *ss, uint32_t *ms, uint32_t *us);
+bool UI_getTotalTime(uint32_t *hh, uint32_t *mm, uint32_t *ss, uint32_t *ms, uint32_t *us);
 void UI_setCurrentTime(uint64_t pts);
 void UI_setTotalTime(uint64_t curTime);
 void UI_setSegments(uint32_t numOfSegs, uint64_t * segPts);

avidemux/common/ADM_commonUI/myOwnMenu.h

@@ -34,7 +34,7 @@ typedef struct
 #ifdef MENU_DECLARE
 static const MenuEntry _myMenuFile[] = {
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Open"),               NULL,ACT_OPEN_VIDEO,    MKICON(fileopen),"Ctrl+O",0},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Append"),             NULL,ACT_APPEND_VIDEO,  NULL,"Ctrl+A",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Append"),             NULL,ACT_APPEND_VIDEO,  MKICON(append),"Ctrl+A",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Save"),               NULL,ACT_SAVE_VIDEO,    MKICON(filesave),"Ctrl+S",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Queue"),              NULL,ACT_SAVE_QUEUE,    NULL,"Ctrl+U",0},
             {MENU_SUBMENU,QT_TRANSLATE_NOOP("adm","Save as Image"),     NULL,ACT_DUMMY,         NULL,NULL,0},
@@ -65,22 +65,24 @@ static const MenuEntry _myMenuRecent[] = {
 std::vector<MenuEntry> myMenuRecent(_myMenuRecent, _myMenuRecent + sizeof(_myMenuRecent) / sizeof(_myMenuRecent[0]));
 
 static const MenuEntry _myMenuEdit[] = {
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Undo"),               NULL,ACT_Undo,          NULL,"Ctrl+Z",0},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Redo"),               NULL,ACT_Redo,          NULL,"Ctrl+Y",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Undo"),               NULL,ACT_Undo,          MKICON(undo),"Ctrl+Z",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Redo"),               NULL,ACT_Redo,          MKICON(redo),"Ctrl+Y",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Edit"),         NULL,ACT_ResetSegments, NULL,NULL,0},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Cut"),                NULL,ACT_Cut,           NULL,"Ctrl+X",0},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Copy"),               NULL,ACT_Copy,          NULL,"Ctrl+C",0},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Paste"),              NULL,ACT_Paste,         NULL,"Ctrl+V",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Cut"),                NULL,ACT_Cut,           MKICON(cut),"Ctrl+X",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Copy"),               NULL,ACT_Copy,          MKICON(copy),"Ctrl+C",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Paste"),              NULL,ACT_Paste,         MKICON(paste),"Ctrl+V",0},
 #ifdef __APPLE__
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete,        NULL,"Backspace",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete,        MKICON(delete_selection),"Backspace",0},
 #else
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete,        NULL,"Delete",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Delete"),             NULL,ACT_Delete,        MKICON(delete_selection),"Delete",0},
 #endif
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker A"),       NULL,ACT_MarkA,         MKICON(markA), "Ctrl+PgUp",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker B"),       NULL,ACT_MarkB,         MKICON(markB), "Ctrl+PgDown",0},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Marker A"),     NULL,ACT_ResetMarkerA,  NULL,"Ctrl+Shift+PgUp",0},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Marker B"),     NULL,ACT_ResetMarkerB,  NULL,"Ctrl+Shift+PgDown",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Edit Marker A"),      NULL,ACT_SelectMarkerA, MKICON(time), "Ctrl+Alt+PgUp",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Edit Marker B"),      NULL,ACT_SelectMarkerB, MKICON(time), "Ctrl+Alt+PgDown",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Marker A"),     NULL,ACT_ResetMarkerA,  MKICON(reset_markA),"Ctrl+Shift+PgUp",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Marker B"),     NULL,ACT_ResetMarkerB,  MKICON(reset_markB),"Ctrl+Shift+PgDown",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Markers"),      NULL,ACT_ResetMarkers,  NULL,"Ctrl+Home",0},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY,NULL,NULL,1},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Pr&eferences"),       NULL,ACT_PREFERENCES,   NULL,NULL,0},
@@ -146,7 +148,7 @@ static const MenuEntry _myMenuGo[] = {
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker A"),      NULL,ACT_GotoMarkA,       MKICON(goMarkA),         "PgUp",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Marker B"),      NULL,ACT_GotoMarkB,       MKICON(goMarkB),         "PgDown",0},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY, NULL,NULL,1},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Time"),          NULL,ACT_SelectTime,      NULL,                  "Ctrl+T",0},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Go To Time"),          NULL,ACT_SelectTime,      MKICON(time),          "Ctrl+T",0},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY, NULL,NULL,1},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Backward 1 second"),   NULL,ACT_Back1Second,     MKICON(backward1s),    "Shift+Left",0},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Forward 1 second"),    NULL,ACT_Forward1Second,  MKICON(forward1s),     "Shift+Right",0},

avidemux/common/gui_action.names

@@ -12,7 +12,14 @@ ACT(StopAvi)
 ACT(STAGED_BEGIN)
 ACT(SetHDRConfig)
 ACT(SetPostProcessing)
+ACT(GetTime)
+ACT(GetMarkerA)
+ACT(GetMarkerB)
+ACT(GetSelection)
+ACT(GetTotal)
 ACT(SelectTime)
+ACT(SelectMarkerA)
+ACT(SelectMarkerB)
 ACT(STAGED_END)
 
 //----- SAVE -----
@@ -48,6 +55,8 @@ ACT(Goto)
 ACT(GotoTime)
 ACT(Begin)
 ACT(End)
+ACT(ChangeMarkerA)
+ACT(ChangeMarkerB)
 ACT(GotoMarkA)
 ACT(GotoMarkB)
 ACT(Scale)