Merged pull request #77.

Conflicts:
	src/mpc-hc/mpcresources/mplayerc.de.rc

28 files changed, 15 insertions, 8 deletions

diff --git a/src/mpc-hc/PPageExternalFilters.cpp b/src/mpc-hc/PPageExternalFilters.cpp
index fa5aefa10..535c810df 100644
--- a/src/mpc-hc/PPageExternalFilters.cpp
+++ b/src/mpc-hc/PPageExternalFilters.cpp
@@ -47,17 +47,16 @@ void CPPageExternalFiltersListBox::PreSubclassWindow()
 INT_PTR CPPageExternalFiltersListBox::OnToolHitTest(CPoint point, TOOLINFO* pTI) const

 {

     BOOL out = FALSE;

-    pTI->uId = ItemFromPoint(point, out);

+    UINT item = ItemFromPoint(point, out);

     if (out) {

         return -1;

     }

 

-    CRect r;

-    VERIFY(GetItemRect(pTI->uId, r) != LB_ERR);

-    pTI->rect = r;

+    pTI->uFlags |= TTF_ALWAYSTIP;

     pTI->hwnd = m_hWnd;

+    pTI->uId = item;

+    VERIFY(GetItemRect(item, &pTI->rect) != LB_ERR);

     pTI->lpszText = LPSTR_TEXTCALLBACK;

-    pTI->uFlags |= TTF_ALWAYSTIP;

 

     return pTI->uId;

 }

diff --git a/src/mpc-hc/PPageFormats.cpp b/src/mpc-hc/PPageFormats.cpp
index d70a050ce..11695a609 100644
--- a/src/mpc-hc/PPageFormats.cpp
+++ b/src/mpc-hc/PPageFormats.cpp
@@ -517,6 +517,10 @@ void CPPageFormats::OnBnClickedResetExtensionsList()
         mfc.RestoreDefaultExts();

         m_exts = mfc.GetExtsWithPeriod();

 

+        CString label;

+        label.Format(_T("%s (%s)"), mfc.GetDescription(), mfc.GetExts());

+        m_list.SetItemText(iItem, COL_CATEGORY, label);

+

         UpdateMediaCategoryState(iItem);

         UpdateData(FALSE);

 

@@ -537,6 +541,10 @@ void CPPageFormats::OnBnClickedSetExtensionsList()
         mfc.SetExts(m_exts);

         m_exts = mfc.GetExtsWithPeriod();

 

+        CString label;

+        label.Format(_T("%s (%s)"), mfc.GetDescription(), mfc.GetExts());

+        m_list.SetItemText(iItem, COL_CATEGORY, label);

+

         UpdateMediaCategoryState(iItem);

         UpdateData(FALSE);

 

diff --git a/src/mpc-hc/mpcresources/mplayerc.br.rc b/src/mpc-hc/mpcresources/mplayerc.br.rc
index a54d1c125..be2370cfe 100644
--- a/src/mpc-hc/mpcresources/mplayerc.br.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.br.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.by.rc b/src/mpc-hc/mpcresources/mplayerc.by.rc
index 9bb4d5fe5..2d9dfcf53 100644
--- a/src/mpc-hc/mpcresources/mplayerc.by.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.by.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.ca.rc b/src/mpc-hc/mpcresources/mplayerc.ca.rc
index 6421965a7..6a0c6d6de 100644
--- a/src/mpc-hc/mpcresources/mplayerc.ca.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.ca.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.cz.rc b/src/mpc-hc/mpcresources/mplayerc.cz.rc
index d4876fa30..766c0e33a 100644
--- a/src/mpc-hc/mpcresources/mplayerc.cz.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.cz.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.de.rc b/src/mpc-hc/mpcresources/mplayerc.de.rc
index c54723267..366857b50 100644
--- a/src/mpc-hc/mpcresources/mplayerc.de.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.de.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.el.rc b/src/mpc-hc/mpcresources/mplayerc.el.rc
index aad433c01..f4b70cb7c 100644
--- a/src/mpc-hc/mpcresources/mplayerc.el.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.el.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.es.rc b/src/mpc-hc/mpcresources/mplayerc.es.rc
index e0d01c68d..9c8fe13fd 100644
--- a/src/mpc-hc/mpcresources/mplayerc.es.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.es.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.eu.rc b/src/mpc-hc/mpcresources/mplayerc.eu.rc
index d0ecd3d14..a6ef26c12 100644
--- a/src/mpc-hc/mpcresources/mplayerc.eu.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.eu.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.fr.rc b/src/mpc-hc/mpcresources/mplayerc.fr.rc
index 7be48ce75..d38b8dede 100644
--- a/src/mpc-hc/mpcresources/mplayerc.fr.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.fr.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.he.rc b/src/mpc-hc/mpcresources/mplayerc.he.rc
index 21206e38b..3158fc58a 100644
--- a/src/mpc-hc/mpcresources/mplayerc.he.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.he.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.hu.rc b/src/mpc-hc/mpcresources/mplayerc.hu.rc
index 695099cd1..50bc3fc13 100644
--- a/src/mpc-hc/mpcresources/mplayerc.hu.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.hu.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.hy.rc b/src/mpc-hc/mpcresources/mplayerc.hy.rc
index 4ce00d76e..a174704a9 100644
--- a/src/mpc-hc/mpcresources/mplayerc.hy.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.hy.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.it.rc b/src/mpc-hc/mpcresources/mplayerc.it.rc
index 1cdca5fc2..93c2cee97 100644
--- a/src/mpc-hc/mpcresources/mplayerc.it.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.it.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.ja.rc b/src/mpc-hc/mpcresources/mplayerc.ja.rc
index e7d68a196..cb36c0426 100644
--- a/src/mpc-hc/mpcresources/mplayerc.ja.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.ja.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.kr.rc b/src/mpc-hc/mpcresources/mplayerc.kr.rc
index c6f45604f..294d7a3d9 100644
--- a/src/mpc-hc/mpcresources/mplayerc.kr.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.kr.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.nl.rc b/src/mpc-hc/mpcresources/mplayerc.nl.rc
index daa7fed54..c78889632 100644
--- a/src/mpc-hc/mpcresources/mplayerc.nl.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.nl.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.pl.rc b/src/mpc-hc/mpcresources/mplayerc.pl.rc
index fa497fe60..abee960fd 100644
--- a/src/mpc-hc/mpcresources/mplayerc.pl.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.pl.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.ro.rc b/src/mpc-hc/mpcresources/mplayerc.ro.rc
index 7323a0275..907065669 100644
--- a/src/mpc-hc/mpcresources/mplayerc.ro.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.ro.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.ru.rc b/src/mpc-hc/mpcresources/mplayerc.ru.rc
index 69ee485c2..b965e0b95 100644
--- a/src/mpc-hc/mpcresources/mplayerc.ru.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.ru.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.sc.rc b/src/mpc-hc/mpcresources/mplayerc.sc.rc
index e63999cc7..4f5a55a35 100644
--- a/src/mpc-hc/mpcresources/mplayerc.sc.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.sc.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.sk.rc b/src/mpc-hc/mpcresources/mplayerc.sk.rc
index a446ed0c8..c3bffb2e0 100644
--- a/src/mpc-hc/mpcresources/mplayerc.sk.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.sk.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.sv.rc b/src/mpc-hc/mpcresources/mplayerc.sv.rc
index 2c722a7b9..9b05e0928 100644
--- a/src/mpc-hc/mpcresources/mplayerc.sv.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.sv.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.tc.rc b/src/mpc-hc/mpcresources/mplayerc.tc.rc
index 5f9bb7513..00468d4f3 100644
--- a/src/mpc-hc/mpcresources/mplayerc.tc.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.tc.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.tr.rc b/src/mpc-hc/mpcresources/mplayerc.tr.rc
index e15084195..380f8b7b8 100644
--- a/src/mpc-hc/mpcresources/mplayerc.tr.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.tr.rc
diff --git a/src/mpc-hc/mpcresources/mplayerc.ua.rc b/src/mpc-hc/mpcresources/mplayerc.ua.rc
index 7308e40d6..24429f603 100644
--- a/src/mpc-hc/mpcresources/mplayerc.ua.rc
+++ b/src/mpc-hc/mpcresources/mplayerc.ua.rc
diff --git a/src/mpc-hc/mplayerc.rc b/src/mpc-hc/mplayerc.rc
index e3609bfd2..8f67a0d03 100644
--- a/src/mpc-hc/mplayerc.rc
+++ b/src/mpc-hc/mplayerc.rc
@@ -885,9 +885,9 @@ BEGIN
     CONTROL         "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,150,129,13,14

     LTEXT           "day(s)",IDC_STATIC,155,131,50,8

     GROUPBOX        "Settings management",IDC_STATIC,5,151,286,28

-    PUSHBUTTON      "Reset",IDC_RESET_SETTINGS,10,161,75,14

-    PUSHBUTTON      "Export",IDC_EXPORT_SETTINGS,95,161,75,14

-    PUSHBUTTON      "Export keys",IDC_EXPORT_KEYS,180,161,75,14

+    PUSHBUTTON      "Reset",IDC_RESET_SETTINGS,10,161,86,14

+    PUSHBUTTON      "Export",IDC_EXPORT_SETTINGS,200,161,86,14

+    PUSHBUTTON      "Export keys",IDC_EXPORT_KEYS,105,161,86,14

 END

 

 IDD_TUNER_SCAN DIALOGEX 0, 0, 407, 246