Changeset 84

Timestamp:

01/31/07 08:38:33 (5 years ago)

Author:

bobef

Message:

updated to rulesPlayer 0.96

Files:

• downloads/rulesplayer.zip (modified) (previous)
• downloads/rulessetup.exe (modified) (previous)
• trunk/setup/rulessetup.nsi (modified) (5 diffs)
• trunk/src/player/app.d (modified) (33 diffs)
• trunk/src/player/changelog.txt (modified) (1 diff)
• trunk/src/player/common.d (modified) (2 diffs)
• trunk/src/player/config.d (modified) (9 diffs)
• trunk/src/player/console.d (modified) (11 diffs)
• trunk/src/player/contextmenu.kfg (modified) (2 diffs)
• trunk/src/player/default.kfg (modified) (2 diffs)
• trunk/src/player/expmenu (added)
• trunk/src/player/expmenu.dll (added)
• trunk/src/player/expmenu/EXPMENU.C (added)
• trunk/src/player/expmenu/EXPMENU.sln (added)
• trunk/src/player/expmenu/EXPMENU.vcproj (added)
• trunk/src/player/images/0_forward.ico (modified) (previous)
• trunk/src/player/images/1_player.ico (modified) (previous)
• trunk/src/player/images/3_play.ico (modified) (previous)
• trunk/src/player/images/4_video.ico (modified) (previous)
• trunk/src/player/images/5_video2.ico (modified) (previous)
• trunk/src/player/images/logo (modified) (previous)
• trunk/src/player/lang_English.kfg (modified) (7 diffs)
• trunk/src/player/player.d (modified) (7 diffs)
• trunk/src/player/player.exe (modified) (previous)
• trunk/src/player/playlist.d (modified) (8 diffs)
• trunk/src/player/readme.txt (modified) (2 diffs)
• trunk/src/player/tv (added)
• trunk/src/player/tv/channels.dat (added)
• trunk/src/player/tv/channels.rpl (added)
• trunk/src/player/tv/readme.txt (added)
• trunk/src/player/tv/src (added)
• trunk/src/player/tv/src/build.bat (added)
• trunk/src/player/tv/src/tv2rpl.d (added)
• trunk/src/player/tv/src/xml.d (added)
• trunk/src/player/tv/tv2rpl.exe (added)

trunk/setup/rulessetup.nsi

@@ -1 +1 @@
-SetCompressor zlib
-
-5
+6
-Name "rulesPlayer ${VERSION}"
-OutFile "rulessetup.exe"
@@ -39 +39 @@
-Var mplayer_version
-Var fatalerrors
-
-
+
+
+
-
-Function .onInit
@@ -150 +151 @@
-  Abort
-done:
-4
+5
-FunctionEnd
-
@@ -170 +171 @@
-  File ".\rulesPlayer\config.kfg"
-  SetOverwrite on
+SectionEnd
+
+Section "Install TV tool"
+  StrCpy $tvtool "1"
+  File /r ".\rulesPlayer\tv"
-SectionEnd
-
@@ -244 +250 @@
-  CreateShortCut "$SMPROGRAMS\rulesPlayer\faq.lnk" "$INSTDIR\faq.txt" "" "$INSTDIR\faq.txt" 0
-  done:
+  StrCmp $tvtool "1" eq2 done2
+  eq2:
+  CreateShortCut "$SMPROGRAMS\rulesPlayer\tv tool.lnk" "$INSTDIR\tv" "" "$INSTDIR\tv" 0
+  done2:
-SectionEnd
-

trunk/src/player/app.d

@@ -3 +3 @@
-//todo: size calculations can be improved when blackband is enabled (test with desktop screen capture)
-
-
-
-
+
+
-
-////////////////////////minor
@@ -14 +13 @@
-//todo: bindings for dvd navigation (next/prev title/chapter/angle)
-//todo: no code to handle (s)vcd-s
-
-
-
-
-
-
-
-
-
-5
+ (profile and increase performance)
+
+
+
+
+
+
+
+
+6
-const char[] appname                        ="rulesPlayer";
-const int last_menu_item_index_in_use       =149;
-4
+5
-
-
@@ -42 +41 @@
-import ak.core;
-import win32.win32;
+import std.c.windows.windows;
-
-version (Windows)
@@ -65 +65 @@
-    pragma(lib,"..\\thirdparty\\dwt\\oleacc_dwt.lib");
-}
+
+extern(Windows) alias BOOL function(HWND,LPCTSTR,POINT) DoExplorerMenu_t;
+DoExplorerMenu_t DoExplorerMenu;
-
-class rulesplayer
@@ -284 +287 @@
-        mitems[15] = new MenuItem (submenu, DWT.CASCADE);
-        mitems[15].setText ("Play DVD");
-Menu submenu2
-submenu2
+menus[5]
+menus[5]
-        char[4] drv="A:\\\0";
+        int len=0;
-        for(char c='A';c<='Z';c++)
-        {
@@ -292 +296 @@
-            if(GetDriveTypeA(drv.ptr)==DRIVE_CDROM)
-            {
-submenu2
+menus[5]
-                    char[][] file;
-                    file~=(cast(StringObj)e.cData).data;
@@ -300 +304 @@
-                    theapp.player.open(file,1);});
-                item.setText(drv[0..2]);
-
-
+
+
+
+
-        //item.setImage(new Image(display,std.path.join(appdir,"images\\dvd")));
-        mitems[9] = new MenuItem (submenu, DWT.PUSH); mitems[9].handleEvent (this,DWT.Selection, delegate (Event e) {theapp.player.quit();});
@@ -323 +329 @@
-        mitems[121] = new MenuItem (submenu, DWT.CASCADE);
-        mitems[121].setText ("MPlayer priority\t(R)");
-
+Menu 
-        mitems[121].setMenu (submenu2);
-        mitems[34] = new MenuItem (submenu2, DWT.RADIO); mitems[34].handleEvent (this,DWT.Selection, delegate (Event e) {if(!(cast(MenuItem)e.widget).getSelection()) return; theapp.config.setVar("mp_priority","idle");});
@@ -500 +506 @@
-        mitems[27] = new MenuItem (submenu, DWT.CASCADE);
-        mitems[27].setText ("Track\t(R)");
+        mitems[27].setMenu(menus[1]=new Menu (shell, DWT.DROP_DOWN));
-        //fileItem2.setImage(new Image(display,std.path.join(appdir,"images\\audiotrack")));
-        mitems[134] = new MenuItem (submenu, DWT.CASCADE);
@@ -547 +554 @@
-        mitems[25] = new MenuItem (submenu, DWT.CASCADE);
-        mitems[25].setText ("Track");
+        mitems[25].setMenu(menus[0]=new Menu (shell, DWT.DROP_DOWN));
-        mitems[138] = new MenuItem (submenu, DWT.CASCADE);
-        mitems[138].setText ("Size\t(R)");
@@ -682 +690 @@
-        menus[4] = new Menu (shell, DWT.DROP_DOWN);
-        mitems[142].setMenu (menus[4]);
-s
+
-        bool callback(DirEntry* de)
-        {
@@ -712 +720 @@
-        mitems[143] = new MenuItem (submenu, DWT.CHECK); mitems[143].handleEvent (this,DWT.Selection, delegate (Event e) {theapp.config.setVar("w_centeronresize",std.string.toString(cast(int)!theapp.centeronresize));});
-        mitems[143].setText ("Center after resize");
+        mitems[116] = new MenuItem (submenu, DWT.CHECK); mitems[116].handleEvent (this,DWT.Selection, delegate (Event e) {theapp.config.setVar("w_startfull",std.string.toString(cast(int)!theapp.startfull));});
+        mitems[116].setText ("Start in fullscreen");
+        new MenuItem (submenu, DWT.SEPARATOR);
+        mitems[109] = new MenuItem (submenu, DWT.CHECK); mitems[109].handleEvent (this,DWT.Selection, delegate (Event e) {theapp.config.setVar("w_minimizetotray",std.string.toString(cast(int)!theapp.mintray));});
+        mitems[109].setText ("Minimize to tray");
+        mitems[108] = new MenuItem (submenu, DWT.CHECK); mitems[108].handleEvent (this,DWT.Selection, delegate (Event e) {theapp.config.setVar("w_closetotray",std.string.toString(cast(int)!theapp.closetray));});
+        mitems[108].setText ("Close to tray");
+        mitems[107] = new MenuItem (submenu, DWT.CHECK); mitems[107].handleEvent (this,DWT.Selection, delegate (Event e) {theapp.config.setVar("w_resideintray",std.string.toString(cast(int)!theapp.residetray));});
+        mitems[107].setText ("Reside in tray");
+        new MenuItem (submenu, DWT.SEPARATOR);
-        mitems[18] = new MenuItem (submenu, DWT.CHECK); mitems[18].handleEvent (this,DWT.Selection, delegate (Event e) {if(theapp.isfull) return;theapp.config.setVar("w_ontop",std.string.toString(cast(int)!theapp.ontop));});
-        mitems[18].setText ("Stick on top");
-6] = new MenuItem (submenu, DWT.CHECK); mitems[116].handleEvent (this,DWT.Selection, delegate (Event e) {theapp.config.setVar("w_startfull",std.string.toString(cast(int)!theapp.startfull)
-6].setText ("Start in fullscreen
+0] = new MenuItem (submenu, DWT.CHECK); mitems[110].handleEvent (this,DWT.Selection, delegate (Event e) {theapp.settitlebar(!theapp.hastitle
+0].setText ("Show titlebar
-        //item.setImage(new Image(display,std.path.join(appdir,"images\\ontop")));
-
+/*-rootwin but it aint working*/
-        //item.setText ("Desktop mode");
+
+        ////////////tray menu
+        trayMenu = new Menu(shell);
+        restoretrayitem = new MenuItem(trayMenu, DWT.PUSH);
+        restoretrayitem.handleEvent(this, DWT.Selection, delegate(Event e){
+            if(theapp.shell.getMinimized()) theapp.fromTray();
+            else theapp.toTray();
+        });
+        restoretrayitem.setText("Hide");
+        trayMenu.setDefaultItem(restoretrayitem);
+        new MenuItem(trayMenu, DWT.SEPARATOR);
+        mitems[106] = new MenuItem(trayMenu, DWT.PUSH);
+        mitems[106].setText("Exit");
+        mitems[106].handleEvent(this, DWT.Selection, delegate(Event e){theapp.closetray=0;theapp.shell.close();});
-
-        shell.setLayout(new FillLayout());
@@ -728 +760 @@
-        console.show(0);
-        playlist.show(0);
+        settitlebar(-1); //save default window styles
-        config.exec(std.path.join(appdir,"config.kfg"),0);
-        config.exec(std.path.join(appdir,"autoexec.kfg"),0);
-        setDefaultStrings();
-
-
+
+
-
-        //special initialization
@@ -1044 +1078 @@
-    }
-
-,iscomp
+=0,iscomp=0,hastitle=1
-
-    void setaspect(float asp)
@@ -1053 +1087 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        if(comp && !iscomp)
@@ -1091 +1154 @@
-            if(tmove.getState()==Thread.TS.RUNNING) tmove.wait();
-        }
-
+if(updatevar) 
-        theapp.updateCompact();
-    }
-
-
+,int updatevar=1
-    {
-        static WINDOWPLACEMENT wp;
-
+,alaststyle,alaststyleex
-        wp.length=WINDOWPLACEMENT.sizeof;
-        if(full && !isfull)
@@ -1104 +1167 @@
-            wascomp=iscomp;
-            isfull=1;
+            alaststyle=GetWindowLongA(shell.handle,GWL_STYLE);
+            alaststyleex=GetWindowLongA(shell.handle,GWL_EXSTYLE);
+            SetWindowLongA(shell.handle,GWL_STYLE,WS_POPUP|WS_VISIBLE);
+            SetWindowLongA(shell.handle,GWL_EXSTYLE,WS_EX_APPWINDOW|WS_EX_TOPMOST);
-            GetWindowPlacement(shell.handle,&wp);
-            laststyle=GetWindowLongA(shell.handle,GWL_STYLE);
-            laststyleex=GetWindowLongA(shell.handle,GWL_EXSTYLE);
-            Rectangle d=display.getPrimaryMonitor().getBounds();
-            lastrect=shell.getBounds();
-            SetWindowLongA(shell.handle,GWL_STYLE,WS_POPUP|WS_VISIBLE);
-            SetWindowLongA(shell.handle,GWL_EXSTYLE,WS_EX_APPWINDOW|WS_EX_TOPMOST);
-            settop(1);
-            shell.setLocation(0,0);
@@ -1119 +1182 @@
-        {
-            isfull=0;
-
-
+a
+a
-            if(!ontop) settop(0);
-            //shell.setLocation(lastrect.x,lastrect.y);
@@ -1131 +1194 @@
-            }
-        }
-
+if(updatevar) 
-        theapp.updateFullscreen();
-    }
@@ -1138 +1201 @@
-    int mousev=1,mousehidetime;
-    int isfull,laststyle,laststyleex;
-
+,mintray=0,closetray=0,residetray=0
-    dwt.graphics.rectangle.Rectangle lastrect;
-
@@ -1185 +1248 @@
-    void updateFullscreen(){if(noupdate) return;mitems[41].setSelection(theapp.isfull);}
-    void updateCompact(){if(noupdate) return;mitems[111].setSelection(theapp.iscomp);}
+    void updateTitlebar(){if(noupdate) return;mitems[110].setSelection(theapp.hastitle);}
-    void updateDeinterlace(){if(noupdate) return;mitems[22].setSelection(theapp.player.deinterlace);}
-    void updateIdx(){if(noupdate) return;mitems[69].setSelection(theapp.player.idx);}
@@ -1328 +1392 @@
-        }
-        else mitems[56].setEnabled(0);
+    }
+    void updateMintray(){if(noupdate) return;mitems[109].setSelection(mintray);}
+    void updateClosetray(){if(noupdate) return;mitems[108].setSelection(closetray);}
+    void updateResidetray()
+    {
+        if(noupdate) return;
+        mitems[107].setSelection(residetray);
+        if(residetray && !trayItem) toTray(0);
+        else if(!residetray && trayItem) fromTray(0);
-    }
-
@@ -1375 +1448 @@
-        updateStrings();
-        updateLanguage();
+        updateResidetray();
+        updateClosetray();
+        updateMintray();
+        updateTitlebar();
-        updateStatus();
+        updateProgress();
-    }
-
@@ -1475 +1553 @@
-        for(int c=0;c<=last_menu_item_index_in_use;c++)
-        {
-11
+05
-            else if(c==113) c=116; //skip aspect ratios
-            else if(c==47) c=49; //skip volume
@@ -1484 +1562 @@
-            else */mitems[c].setText(getString(c+5000));
-        }
+        if(restoretrayitem) restoretrayitem.setText(getString(shell.getMinimized()?111:112));
-        btnplay.setToolTipText(getString(55));
-        btnpause.setToolTipText(getString(56));
@@ -1520 +1599 @@
-        if(r)
-        {
-cmd,*r
+*r,cmd
-            else return (*r).dup;
-        }
@@ -1553 +1632 @@
-            return 0;
-        }
+    }
+
+    TrayItem trayItem;
+    Menu trayMenu;
+    Image shellimage;
+    MenuItem restoretrayitem;
+
+    void toTray(int hide=1)
+    {
+        if(!trayItem)
+        {
+            trayItem = new TrayItem(shell.getDisplay().getSystemTray(), DWT.NONE);
+            trayItem.handleEvent(this, DWT.MenuDetect, delegate(Event e){
+                theapp.trayMenu.setLocation(display.getCursorLocation());
+                theapp.trayMenu.setVisible(true);
+            });
+            trayItem.handleEvent(this, DWT.Selection, delegate(Event e){
+                if(theapp.shell.getMinimized()) theapp.fromTray();
+                else theapp.toTray();
+            });
+            trayItem.setToolTipText(appname);
+            trayItem.setImage(shellimage);
+        }
+        if(hide)
+        {
+            if(trayMenu) restoretrayitem.setText(getString(111));
+            shell.setMinimized(true);
+            shell.setVisible(false);
+        }
+    }
+
+    void fromTray(int show=1)
+    {
+        if(trayItem && !residetray) {trayItem.dispose();trayItem=null;}
+        if(show)
+        {
+            if(trayMenu) restoretrayitem.setText(getString(112));
+            shell.setVisible(true);
+            shell.setMinimized(false);      
+        }
+    }
+
+    void exit()
+    {
+        noupdate=1;
+        config.write(std.path.join(appdir,"config.kfg"));
+        notquit=0;
+        player.quit();
-    }
-
@@ -1610 +1737 @@
-    int l=GetWindowsDirectoryA(dir.ptr,MAX_PATH);
-    Config.defaults["windows_dir"]=toUTF(dir[0..l].dup);
+    auto h=LoadLibraryA("expmenu.dll\0".ptr);
+    if(h) DoExplorerMenu=cast(DoExplorerMenu_t)GetProcAddress(h,"DoExplorerMenu\0".ptr);
-    display = Display.getDefault();
-    theapp=new rulesplayer;
-    theapp.createshell();
-    theapp.player.showlogo();
-
+
+
-    theapp.shell.handleEvent(theapp.shell,DWT.Deactivate,delegate(Event e){if(theapp.isfull && !indialog) theapp.fullscreen(0);});
-    if(argv.length>1)
@@ -1643 +1773 @@
-        display.sleep();
-    }
+    if(h) FreeLibrary(h);
-    display.dispose();
-    }catch(Object o)
@@ -2144 +2275 @@
-    translation_strings[104]="Please enter some stuff:";
-    translation_strings[105]="Open URL...";
+    translation_strings[106]="Subtitle track";
+    translation_strings[107]="Audio track";
+    translation_strings[108]="error: a file must be opened to display the system menu";
+    translation_strings[109]="error: expmenu.dll failed to load properly";
+    translation_strings[110]="error: a file must be opened to display information about it";
+    translation_strings[111]="Restore";
+    translation_strings[112]="Hide";
+    translation_strings[113]="Enter title for the playlist item:";
+    translation_strings[114]="Search the playlist...";
-
-    translation_strings[5028]="&File";
@@ -2229 +2369 @@
-    translation_strings[5014]="Resize after movie";
-    translation_strings[5143]="Center after resize";
+    translation_strings[5116]="Start in fullscreen mode";
+    translation_strings[5109]="Minimize to tray";
+    translation_strings[5108]="Close to tray";
+    translation_strings[5107]="Reside in tray";
-    translation_strings[5018]="Stick on top";
-6]="Start in fullscreen mode
+0]="Show titlebar
-    translation_strings[5144]="Add file(s)...";
-    translation_strings[5145]="Add URL...";
@@ -2237 +2381 @@
-    translation_strings[5148]="Save...";
-    translation_strings[5149]="Load...";
+    translation_strings[5106]="Exit";
+    translation_strings[5105]="Search...";
-
-    translation_helps["alias"]="command: alias <name> <command>\nusage: creates an alias named 'name' for 'command'";
@@ -2301 +2447 @@
-    translation_helps["updateui"]="command: updateui\nusage: updates the user interface so any translations could take effect";
-    translation_helps["getinput"]="command: getinput <varname> [prompt]\nusage: asks the user for input and saves it to variable named 'varname'";
+    translation_helps["menu_subtrack"]="command: menu_subtrack <itemname>\nusage: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the subtitle tracks menu";
+    translation_helps["menu_audiotrack"]="command: menu_audiotrack <itemname>\nusage: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the audio tracks menu";
+    translation_helps["menu_language"]="command: menu_language <itemname>\nusage: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the language menu";
+    translation_helps["menu_playdvd"]="command: menu_playdvd <itemname>\nusage: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the play dvd menu";
+    translation_helps["menu_dvd"]="command: menu_dvd <itemname>\nusage: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the dvd menu";
+    translation_helps["menu_recent"]="command: menu_recent <itemname>\nusage: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the recent files menu";
+    translation_helps["menu_system"]="command: menu_system\nusage: displays the OS shell menu for the currently playing file";
+    translation_helps["pladd2"]="command: pladd [title] [file]\nusage: adds a file to the playlist with specified title";
+    translation_helps["pladdurl2"]="command: pladdurl [title] [file]\nusage: adds a file to the playlist with specified title";
+    translation_helps["plsearch"]="command: plsearch [string]\nerror: displays a playlist search dialog box";
-}}

trunk/src/player/changelog.txt

@@ +1 @@
+0.96
+
+Fixed @ prefix now works per command instead of per line (which means "@cmd1 && @cmd2" is now valid instead of "@cmd1 && cmd2" to prevent both commands from echo)
+Fixed missing string for "stick on top" in lang_English.kfg
+Fixed bug in deleting playlist items
+Fixed and improved playlist saving
+Fixed bug in loading playlist where MPlayer was first item was started several times
+Added feature to remove the titlebar
+Added new commands to allow the context menus to be populated with some more dynamic menus: menu_audiotrack, menu_dvd, menu_language, menu_playdvd, menu_recent, menu_subtrack, menu_system
+Added some new junk to the default context menu
+Added new context menu - ctrl+mouse3 to display system menu about the file
+Added features to minimize/close/reside in tray
+Added pladd2 and pladdurl2 commands
+Added plsearch command
+Added a small utility to extract web tv channels
+Changed the logo (thanks to Tod)
+
+
-0.95
-

trunk/src/player/common.d

@@ -17 +17 @@
-        if(!str) return null;
-        else if(str.eof()) return null;
-
+0
-        int len=0;
-        char ch=0;
@@ -187 +187 @@
-}
-
-[] cmd,in char[] param
+ param,in char[][] cmd
-{
-    char[] ret;

trunk/src/player/config.d

@@ -56 +56 @@
-        {
-            File f=new File(path,FileMode.In);
+            auto fs=new AsciiStream(f);
-            char[] line;
-            for(;;)
-            {
-
+s
-                if(line)
-                {
+                    line=toUTF(line);
-                    if(line.length && line[$-1]=='\\' && (line.length>=2 && line[$-2]!='\\'))
-                    {
@@ -67 +69 @@
-                        while(1)
-                        {
-
+s
-                            if(tl)
-                            {
+                                tl=toUTF(tl);
-                                line.length=line.length-1;
-                                line~=tl;
@@ -95 +98 @@
-    {
-        auto var=name in variables;
-cmd,*var
+*var,cmd
-        else return null;
-    }
@@ -139 +142 @@
-            else if(namehash==hash!("w_mhidetime")) {theapp.mousehidetime=atoi(value);}
-            else if(namehash==hash!("god")) {theapp.god=cast(int)(atoi(value)!=0);}
-
-
+
+
+
-            else if(namehash==hash!("w_startfull")) {theapp.startfull=(cast(int)(atoi(value)!=0));updatedg=&theapp.updateStartfull;}
-            else if(namehash==hash!("v_aspectratio")) {theapp.setaspect(cast(float)(atof(value)));}
@@ -164 +168 @@
-            else if(namehash==hash!("mp_priority")){if(theapp.player.running()) needrestart=1; else updatedg=&theapp.updatePriority;}
-            else if(namehash==hash!("v_pp")){if(theapp.player.running()) needrestart=1; else updatedg=&theapp.updatePP;}
-//
+
-            else if(namehash==hash!("mp_ao")){if(theapp.player.running()) needrestart=1; else updatedg=&theapp.updateAO;}
-            else if(namehash==hash!("sub_codepage")){if(theapp.player.running()) needrestart=1; else updatedg=&theapp.updateCodepage;}
-            else if(namehash==hash!("recentfiles")){int i=atoi(value); if(i<0) {i=0;} theapp.recentfiles=i; theapp.allrecentfiles.length=i; updatedg=&theapp.updateRecent;}
+            else if(namehash==hash!("w_minimizetotray")) {theapp.mintray=cast(int)(atoi(value)!=0); updatedg=&theapp.updateMintray;}
+            else if(namehash==hash!("w_closetotray")) {theapp.closetray=cast(int)(atoi(value)!=0); updatedg=&theapp.updateClosetray;}
+            else if(namehash==hash!("w_resideintray")) {theapp.residetray=cast(int)(atoi(value)!=0); updatedg=&theapp.updateResidetray;}
-        }
-        variables[name]=value;
@@ -179 +186 @@
-    {
-        auto var=name in defaults;
-null,*var
+*var,null
-        else return null;
-    }
@@ -191 +198 @@
-        if(allowrestart && theapp.player.running) theapp.player.restart();
-        else theapp.updateUI();
-        //theapp.updateUI();
-        //theapp.updateStatus();
-        //theapp.updateProgress();
-    }
-
@@ -247 +251 @@
-        defaults["a_deflang"]="en";
-        defaults["a_track"]="0";
+        defaults["w_resideintray"]="0";
+        defaults["w_closetotray"]="0";
+        defaults["w_minimizetotray"]="0";
-        defaults["w_ontop"]="0";
-        defaults["w_fullscreen"]="0";
-        defaults["w_compact"]="0";
-        defaults["w_language"]="English";
+        defaults["w_resizetomovie"]="1";
+        defaults["w_mhidetime"]="1000";
+        defaults["w_startfull"]="0";
+        defaults["w_centeronresize"]="0";
+        defaults["w_titlebar"]="1";
-        defaults["sub_deflang"]="en,eng";
-        defaults["sub_shown"]="1";
@@ -263 +275 @@
-        defaults["dvd_title"]="0";
-        defaults["dvd_angle"]="0";
-        defaults["w_resizetomovie"]="1";
-        defaults["w_mhidetime"]="1000";
-        defaults["w_startfull"]="0";
-        defaults["w_centeronresize"]="0";
-        defaults["fileicon"]="1";
-        defaults["sensitivity"]="10";

trunk/src/player/console.d

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-class Console : Composite
@@ -26 +28 @@
-    Menu[] menus;
-    MenuItem[] menuitems;
+    int[] sharedmenuitems;
-    Menu lastmenu;
-    char[][] autocomplete;
-    char[] autocompleteprefix;
-begin","menuend","menuitem","menuseparator","mpcmd","open","openaudio","openurl","pladd","pladddvd","pladdurl","playorpause","plclear","plload","plnext","plprev","plsave
+_audiotrack","menu_dvd","menu_language","menu_playdvd","menu_recent","menu_subtrack","menu_system","menubegin","menuend","menuitem","menuseparator","mpcmd","open","openaudio","openurl","pladd","pladd2","pladddvd","pladdurl","pladdurl2","playorpause","plclear","plload","plnext","plprev","plsave","plsearch
-
-    void append(char[] line,int internal=1)
@@ -45 +48 @@
-        if(!line.length) return;
-        if(line.length>=2 && line[0..2]=="//") return;
-        int ls=0;
-        if(line[0]=='@') {showline=0;ls++;}
-        if(line.length-ls<=0) return;
-        if(trackhistory)
-        {
@@ -53 +53 @@
-            currentline=pastlines.length;
-        }
-[ls..line.length]
+
-        char[][][] ar;
-        int last=0;
@@ -62 +62 @@
-        }
-        if(last<acmd.length) ar~=acmd[last..acmd.length];
+        int ogshowline=showline;
-        foreach(char[][] cmd;ar)
-        {
-            char[][] params=cmd.dup;
-
+
+
+
-            auto al=params[0] in aliases;
-            if(!al && showline && theapp.config.echo) append(">"~std.string.join(cmd," "));
@@ -259 +262 @@
-            else if(p0hash==hash!("about"))
-            {
-Stefan Teodorescu\n\tTod\n\t...and everybody who's name is missing here\t\n\nsoftware used:\n\tMPlayer - www.mplayer.hq\n\tMPUI - mpui.sourceforge.net\n\tRegan Heath - pipestream library
+cracksloth\n\tStefan Teodorescu\n\tTod\n\t...and everybody who's name is missing here\t\n\nsoftware used:\n\tMPlayer - www.mplayer.hq\n\tMPUI - mpui.sourceforge.net\n\tpipestream library - Regan Heath
-                msgBox(text,"About rulesPlayer",DWT.ICON_INFORMATION);
-            }
-            else if(p0hash==hash!("info"))
-            {
-return;
+{append(theapp.getString(110));return;}
-                char[][] text;
-                text~=theapp.getString(91)~": "~theapp.player.info.filename;
@@ -294 +297 @@
-                else theapp.playlist.add(params[1..params.length]);
-            }
+            else if(p0hash==hash!("pladd2"))
+            {
+                char[][] titles;
+                char[][] files;
+                if(params.length<2)
+                {
+                    auto i=new inputrequest;
+                    indialog=1;
+                    char[] title=i.create(theapp.getString(113),0);
+                    indialog=0;
+                    if(title.length) titles~=title;
+                }
+                else titles~=params[1];
+                if(params.length<3)
+                {
+                    indialog=1;
+                    files=dxFileDialog.open(theapp.getString(99),DWT.OPEN,theapp.filtera,theapp.filterb);
+                    indialog=0;
+                }
+                else files~=params[2];
+                if(!files.length || !titles.length) {append(theapp.getString(13,paramMake(params[0])));return;}
+                else theapp.playlist.add(files,titles);
+            }
-            else if(p0hash==hash!("pladddvd"))
-            {
@@ -308 +334 @@
-                    files~=i.create(theapp.getString(22));
-                    indialog=0;
-
+null,
-                }
-                else theapp.playlist.add(params[1..params.length]);
+            }
+            else if(p0hash==hash!("pladdurl2"))
+            {
+                char[][] titles;
+                char[][] files;
+                int dmp=0;
+                if(params.length<2)
+                {
+                    auto i=new inputrequest;
+                    indialog=1;
+                    char[] title=i.create(theapp.getString(113),0);
+                    indialog=0;
+                    if(title.length) titles~=title;
+                }
+                else titles~=params[1];
+                if(params.length<3)
+                {
+                    auto i=new inputrequest;
+                    indialog=1;
+                    char[] file=i.create(theapp.getString(22));
+                    indialog=0;
+                    if(file.length) files~=file;
+                    dmp=i.dmp;
+                }
+                else files~=params[2];
+                if(!files.length || !titles.length) {append(theapp.getString(13,paramMake(params[0])));return;}
+                else theapp.playlist.add(files,titles,-1,dmp);
+            }
+            else if(p0hash==hash!("plsearch"))
+            {
+                auto i=new plsearch;
+                indialog=1;
+                int r=i.create(params.length>1?params[1]:null);
+                indialog=0;
+                if(r>=0) theapp.playlist.play(r);
-            }
-            else if(p0hash==hash!("errors")) errors(params.length<2 || atoi(params[1]));
@@ -367 +428 @@
-                    if(theapp.iscomp)
-                    {
-Dispos
+Hid
-                        theapp.showcursor(1);
-                    }
+                    menus[0].handleEvent (this,DWT.Hide, delegate (Event e) {foreach(i;theapp.console.sharedmenuitems) theapp.console.menuitems[i].setMenu(null); theapp.console.sharedmenuitems=null;});
-                    menus[0].setLocation(display.getCursorLocation());
-                    menus[0].setVisible(true);
-                    menustarted=0;
-                }
+            }
+            else if(p0hash==hash!("menu_dvd") || p0hash==hash!("menu_recent") || p0hash==hash!("menu_playdvd") || p0hash==hash!("menu_audiotrack") || p0hash==hash!("menu_subtrack") || p0hash==hash!("menu_language"))
+            {
+                if(!menustarted || !lastmenu) {append(theapp.getString(16));return;}
+                else if(params.length<2) {append(theapp.getString(13,paramMake(params[0])));return;}
+                int i=menuitems.length;
+                int i2=0;
+                if(p0hash==hash!("menu_dvd")) i2=2;
+                else if(p0hash==hash!("menu_recent")) i2=3;
+                else if(p0hash==hash!("menu_playdvd")) i2=5;
+                else if(p0hash==hash!("menu_audiotrack")) i2=1;
+                else if(p0hash==hash!("menu_subtrack")) i2=0;
+                else /*if(p0hash==hash!("menu_language"))*/ i2=4;
+                menuitems~=new MenuItem (lastmenu, DWT.CASCADE);
+                menuitems[i].setText (params[1]);
+                if(i2 in theapp.menus)
+                {
+                    menuitems[i].setMenu(theapp.menus[i2]);
+                    if(theapp.menus[i2].getItems().length==0) menuitems[i].setEnabled(0);
+                }
+                sharedmenuitems~=i;
+            }
+            else if(p0hash==hash!("menu_system"))
+            {
+                if(!theapp.player.info.filename.length) {append(theapp.getString(108));return;}
+                if(DoExplorerMenu)
+                {
+                    auto p=display.map(null,theapp.shell,display.getCursorLocation());
+                    POINT p2;
+                    p2.x=p.x;
+                    p2.y=p.y;
+                    DoExplorerMenu(theapp.shell.handle,toStringz(theapp.player.info.filename),p2);
+                }
+                else append(theapp.getString(109));
-            }
-            else if(p0hash==hash!("speed_inc")) theapp.player.speed_inc();
@@ -390 +486 @@
-            else if(p0hash==hash!("clear")) history.setText(null);
-            else if(p0hash==hash!("clearhistory")) {pastlines=null;currentline=0;}
-theapp.shell.close();
+{theapp.closetray=0;theapp.shell.close();}
-            else if(p0hash==hash!("zoom"))
-            {
@@ -470 +566 @@
-            {
-                auto alcmd=parseCommandLine(*al);
-params,alcmd[0]
-arams,p
+alcmd[0],params
+,params
-                char[][] str;
-                str~=alcmd[0];

trunk/src/player/contextmenu.kfg

@@ -2 +2 @@
-    menuitem $#30 @open
-    menuitem $#105 @openurl
+    menu_playdvd $#5015
+    menu_recent $#5118
-    menuitem $#31 @close
-    menuseparator
@@ -22 +24 @@
-    menuend
-    menuseparator
+    menu_dvd $#8
+    menu_subtrack $#106
+    menu_audiotrack $#107
+    menuseparator
-    menuitem $#5119 @info
-    menuitem $#5120 @about

trunk/src/player/default.kfg

@@ -30 +30 @@
-bind v "@toggle sub_shown"
-bind d "@mpcmd frame_drop"
+bind j "@plsearch"
-bind mouse1 @playorpause
-bind mouse1dbl @fullscreen
@@ -35 +36 @@
-bind wheelup "@incf a_volume 5"
-bind wheeldown "@decf a_volume 5"
+bind ctrl+mouse3 @menu_system
-alias play @playorpause
-alias pause @playorpause
-alias fullscreen "@toggle w_fullscreen"
-alias compact "@toggle w_compact"
+alias titlebar "@toggle w_titlebar"
-alias step "@mpcmd frame_step"
-alias subvisiblity "@toggle sub_shown"

trunk/src/player/lang_English.kfg

@@ -40 +40 @@
-setstring 0028 "$#12: $$0 is neither 0 or 1"
-setstring 0101 "$#12: unable to execute config file $$0"
+setstring 0108 "$#12: a file must be opened to display the system menu"
+setstring 0110 "$#12: a file must be opened to display information about it"
+setstring 0109 "$#12: expmenu.dll failed to load properly"
-setstring 0019 "listing available commands:"
-setstring 0020 "listing aliases:"
@@ -56 +59 @@
-setstring 0032 "Playback"
-setstring 0105 "Open URL..."
+setstring 0106 "Subtitle track"
+setstring 0107 "Audio track"
-//
-//error box title
@@ -83 +88 @@
-//the playlist
-//
+setstring 0114 "Search the playlist..."
-setstring 0036 "Playlist"
-setstring 0102 "Colours"
@@ -117 +123 @@
-//the input dialog
-//
+setstring 0113 "Enter title for the playlist item:"
-setstring 0104 "Please enter some stuff:"
-setstring 0022 "Enter URL:"
@@ -162 +169 @@
-setstring 0097 "There was some error extacting the info (see console)"
-setstring 0098 "Clip information"
+//
+//tray menu
+//
+setstring 0111 "Restore"
+setstring 0112 "Hide"
-//
-//////////////// menus
@@ -255 +267 @@
-setstring 5014 "Resize after movie"
-setstring 5143 "Center after resize"
+setstring 5116 "Start in fullscreen mode"
+setstring 5109 "Minimize to tray"
+setstring 5108 "Close to tray"
+setstring 5107 "Reside in tray"
-setstring 5018 "Stick on top"
-6 "Start in fullscreen mode
+0 "Show titlebar
-//playlist [+] button  popup
-setstring 5144 "Add file(s)..."
-setstring 5145 "Add URL..."
+setstring 5105 "Search..."
-setstring 5146 "Sort"
-setstring 5147 "Clear"
-setstring 5148 "Save..."
-setstring 5149 "Load..."
+//tray menu
+setstring 5106 "Exit"
-//
-// help
@@ -330 +349 @@
-sethelp updateui "$#1: updateui\n$#2: updates the user interface so any translations could take effect"
-sethelp getinput "$#1: getinput <varname> [prompt]\n$#2: asks the user for input and saves it to variable named 'varname'"
+sethelp menu_subtrack "$#1: menu_subtrack <itemname>\n$#2: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the subtitle tracks menu"
+sethelp menu_audiotrack "$#1: menu_audiotrack <itemname>\n$#2: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the audio tracks menu"
+sethelp menu_language "$#1: menu_language <itemname>\n$#2: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the language menu"
+sethelp menu_playdvd "$#1: menu_playdvd <itemname>\n$#2: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the play dvd menu"
+sethelp menu_dvd "$#1: menu_dvd <itemname>\n$#2: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the dvd menu"
+sethelp menu_recent "$#1: menu_recent <itemname>\n$#2: adds a menu item called 'itemname' in a menu created with menubegin, filling it with the contents of the recent files menu"
+sethelp menu_system "$#1: menu_system\n$#2: displays the OS shell menu for the currently playing file"
+sethelp pladd2 "$#1: pladd [title] [file]\n$#2: adds a file to the playlist with specified title"
+sethelp pladdurl2 "$#1: pladdurl [title] [file]\n$#2: adds a file to the playlist with specified title"
+sethelp plsearch "$#1: plsearch [string]\n$#2: displays a playlist search dialog box"

trunk/src/player/player.d

@@ -187 +187 @@
-            restarting=0;
-            theapp.updateUI();
-            theapp.updateStatus();
-            theapp.updateProgress();
-        }
-
@@ -219 +217 @@
-            for(;c<ret.length;c++) if(ret[c]!=' ') break;
-            theapp.setStatus(theapp.getString(86,paramMake(ret[c..find(ret,"%")+1])));
+            return echomp==2;
-        }
-        else if(startcmp(liner,"*** screenshot '",ret))
@@ -670 +669 @@
-                theapp.updateProgress();
-            }
-quit
+ 
-            {
-                theapp.setStatus(theapp.getString(78));
@@ -677 +676 @@
-                    reset();
-                    theapp.updateUI();
-                    theapp.updateStatus();
-                    theapp.updateProgress();
-                }
-            }
@@ -911 +908 @@
-        if(playlists==files.length)
-        {
-
+//
-            return;
-        }
@@ -1085 +1082 @@
-    char[] dvdtitle;
-
-3
+20
-    {
-        wantupdate=0;
@@ -1120 +1117 @@
-        if(status!=ERROR && status!=DUMPED) status=NONE;
-        theapp.updateUI();
-        theapp.updateStatus();
-        theapp.updateProgress();
-        reset();
-        theapp.updateStrack();

trunk/src/player/playlist.d

@@ -74 +74 @@
-    }
-
-
-
+
+
+
+
-        foreach(int ii,char[] a;f)
-        {
@@ -84 +86 @@
-            else
-            {
-
+
+
-                else t=getBaseName(a);
-            }
-            item=new TableItem(playlist, DWT.NONE);
-files.length
+ll
-            ff.isdvd=0;
-            ff.fullpath=a.dup;
-            ff.name=t.dup;
-files.length
+ll
-            ff.dump=dump;
-~
+[ll++]
-        }
-        if(autoplay && files.length && current==-1) {play(0);}
-
-
+
+
+
+
-
-    void hl(int i)
@@ -222 +227 @@
-            else file=f[0];
-        }
+        loadingplaylist=1;
-        theapp.config.exec(file);
-
+
+
+
-    }
-
@@ -240 +248 @@
-        foreach(a;files)
-        {
- \""~replace(replace(a.fullpath
-a.fullpath
+2 \""~replace(replace(replace(replace(replace(a.name,"\\","\\\\"),"\t","\\t"),"\n","\\n"),"\"","\\\""),"$","$$")~"\" \""~replace(replace(replace(replace(replace(a.fullpath,"\\","\\\\"),"\t","\\t"),"\n","\\n")
+replace(replace(replace(a.fullpath,"\\","\\\\"),"\t","\\t"),"\n","\\n")
-            f.writeExact(str.ptr,str.length);
-        }
@@ -311 +319 @@
-            filess~=*c;
-        }
-
+null,
-    }
-
@@ -497 +505 @@
-                    if(!a.length) return;
-                    table.remove(a);
-0;c<a.length;c++
+a.length-1;c>=0;c--
-                    for(int c=0;c<theapp.playlist.files.length;c++) table.getItem(c).setText(0,.toString(c+1));
-                    if(a.length==1)
@@ -651 +659 @@
-        theapp.mitems[145].handleEvent (this,DWT.Selection, delegate (Event e) {theapp.console.execLine("pladdurl",0,0);});
-        new MenuItem (menu, DWT.SEPARATOR);
+        theapp.mitems[105] = new MenuItem (menu, DWT.PUSH); theapp.mitems[105].setText ("Search...");
+        theapp.mitems[105].handleEvent (this,DWT.Selection, delegate (Event e){theapp.console.execLine("plsearch",0,0);});
-        theapp.mitems[146] = new MenuItem (menu, DWT.PUSH); theapp.mitems[146].setText ("Sort");
-        theapp.mitems[146].handleEvent (this,DWT.Selection, delegate (Event e){theapp.playlist.sort();});
@@ -781 +791 @@
-    }
-}
+
+class plsearch
+{
+    Shell sShell;
+    Label label;
+    Text input;
+    Button ok;
+    Button cancel;
+    List list;
+    int index=-1;
+    int[int] indices;
+
+    int create(char[] initial=null)
+    {
+        GridData gridData4 = new GridData();
+        gridData4.horizontalAlignment = GridData.END;
+        gridData4.grabExcessHorizontalSpace = true;
+        gridData4.widthHint = 50;
+        gridData4.verticalAlignment = GridData.CENTER;
+        GridData gridData3 = new GridData();
+        gridData3.horizontalAlignment = GridData.END;
+        gridData3.widthHint = 50;
+        gridData3.verticalAlignment = GridData.CENTER;
+        GridData gridData1 = new GridData();
+        gridData1.horizontalSpan = 2;
+        gridData1.verticalAlignment = GridData.CENTER;
+        gridData1.grabExcessHorizontalSpace = true;
+        gridData1.horizontalAlignment = GridData.FILL;
+        GridData gridData11 = new GridData();
+        gridData11.horizontalSpan = 2;
+        gridData11.verticalAlignment = GridData.CENTER;
+        gridData11.grabExcessHorizontalSpace = true;
+        gridData11.horizontalAlignment = GridData.FILL;
+        gridData11.heightHint = 200;
+        GridLayout gridLayout = new GridLayout();
+        gridLayout.makeColumnsEqualWidth = false;
+        gridLayout.marginWidth = 10;
+        gridLayout.marginHeight = 10;
+        gridLayout.verticalSpacing = 5;
+        gridLayout.numColumns = 2;
+        gridLayout.horizontalSpacing = 5;
+        sShell = new Shell(theapp.shell,DWT.DIALOG_TRIM|DWT.APPLICATION_MODAL);
+        sShell.setText(theapp.getString(114));
+        sShell.setLayout(gridLayout);
+        sShell.setSize(new Point(385, 300));
+        input = new Text(sShell, DWT.BORDER);
+        if(!initial.length && theapp.playlist.current>=0) initial=theapp.playlist.files[theapp.playlist.current].name;
+        input.setText(initial);
+        input.setSelection(0,initial.length);
+        input.setLayoutData(gridData1);
+        input.handleEvent (this,DWT.Modify, delegate(Event e){(cast(plsearch)e.cData).update();});
+        /*input.handleEvent (this,DWT.KeyDown, delegate (Event e) {
+            auto s=(cast(plsearch)e.cData);
+            auto i=s.list.getSelectionIndex();
+            if(i==0 || i+1>=s.list.getItemCount()) return;
+            if(e.keyCode==DWT.ARROW_UP) s.list.setSelection(i-1,i-1);
+            else if(e.keyCode==DWT.ARROW_DOWN) s.list.setSelection(i+1,i+1);
+        })*/;
+        list = new List(sShell, DWT.BORDER|DWT.V_SCROLL|DWT.SINGLE);
+        /*list.handleEvent (this,DWT.MouseDoubleClick, delegate (Event e){
+            auto s=(cast(plsearch)e.cData);
+            auto i=s.list.getItem(new Point(e.x,e.y));
+            s.list.setSelection(i,i);
+        });*/
+        list.setLayoutData(gridData11);
+        cancel = new Button(sShell, DWT.NONE);
+        cancel.setText(theapp.getString(72));
+        cancel.setLayoutData(gridData4);
+        cancel.handleEvent (this,DWT.Selection, &oncancel);
+        ok = new Button(sShell, DWT.NONE);
+        ok.setText(theapp.getString(73));
+        ok.setLayoutData(gridData3);
+        ok.handleEvent (this,DWT.Selection, &onok);
+        Rectangle bounds = display.getPrimaryMonitor().getBounds ();
+        Rectangle rect = sShell.getBounds ();
+        int x = bounds.x + (bounds.width - rect.width) / 2;
+        int y = bounds.y + (bounds.height - rect.height) / 2;
+        sShell.setLocation (x, y);
+        sShell.setDefaultButton(cancel);
+        sShell.open();
+        if(initial.length) update();
+        while(!sShell.isDisposed()) if(!display.readAndDispatch()) display.sleep();
+        return index;
+    }
+
+    void update()
+    {
+        list.removeAll();
+        indices=null;
+        int ok=0;
+        char[][] a=parseCommandLine(input.getText());
+        int last=0;
+        for(int c=0;c<theapp.playlist.files.length;c++)
+        {
+            foreach(char[] word;a)
+            {
+                if(ifind(theapp.playlist.files[c].name,word)>=0)
+                {
+                    ok=1;
+                    indices[last++]=theapp.playlist.files[c].index;
+                    list.add(theapp.playlist.files[c].name);
+                    break;
+                }
+            }
+        }
+        if(ok) list.setSelection(0,0);
+    }
+
+    void onok(Event e)
+    {
+        sShell.close();
+    }
+
+    void oncancel(Event e)
+    {
+        index=list.getSelectionIndex();
+        if(index>=0) index=indices[index];
+        sShell.close();
+    }
+}

trunk/src/player/readme.txt

@@ -88 +88 @@
-d - change frame drop mode
-p - toggle playlist
+j - search the playlist
-` (tilde) - show console (escape to hide it)
-escape - hide playlist or console (depending on which one has the focus)
@@ -95 +96 @@
-mouse1 double - fullscreen
-mouse3 - context menu
+ctrl+mouse3 - OS shell menu
-wheelup - audio volume +5%
-wheeldown - audio volume -5%