From 175e5a56d1538a2cd34a25dd04ff1183b6066942 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Thu, 31 Oct 2013 01:22:21 +0100 Subject: [PATCH] Added new drop zone image, adopted from VLC Media Player. --- etc/Translation/Blank.ts | 58 +++++++++++++++++------------------ etc/Translation/LameXP_PL.ts | 58 +++++++++++++++++------------------ etc/Translation/LameXP_SV.ts | 58 +++++++++++++++++------------------ res/Images.qrc | 3 +- res/images/DropZone.png | Bin 0 -> 5942 bytes src/Config.h | 4 +-- src/Dialog_MainWindow.cpp | 10 ++++-- 7 files changed, 98 insertions(+), 93 deletions(-) create mode 100644 res/images/DropZone.png diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index f53c0f11..4e0251a9 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -2567,32 +2567,32 @@ - + Overwrite Mode - + Warning: This mode may overwrite existing files with no way to revert! - + Continue - + Revert - + Already Running - + LameXP is already running, please use the running instance! @@ -3384,105 +3384,105 @@ - - + + Build - + Unknown - + Testing your internet connection, please wait... - - + + It appears that the computer currently is offline! - - + + Please make sure your computer is connected to the internet and try again. - + Network connectivity test has failed! - + Please make sure your internet connection is working properly and try again. - + Checking for new updates online, please wait... - + Failed to fetch update information from server! - + Sorry, the update server might be busy at this time. Plase try again later. - + More information available at: - + A new version of LameXP is available! - + We highly recommend all users to install this update as soon as possible. - + No new updates available at this time. - + Your version of LameXP is still up-to-date. Please check for updates regularly! - + Your version appears to be newer than the latest release. - + This usually indicates your are currently using a pre-release version of LameXP. - + Update is being downloaded, please be patient... - + Update ready to install. Applicaion will quit... - + Update failed. Please try again or download manually! diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index e6df1858..303e625c 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -2584,32 +2584,32 @@ Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację! - + Overwrite Mode Tryb nadpisywania - + Warning: This mode may overwrite existing files with no way to revert! Ostrzeżenie: W tym trybie istniejące pliki będą nadpisywane bez możliwości ich odzyskania! - + Continue Kontynuuj - + Revert Cofnij - + Already Running Już działa - + LameXP is already running, please use the running instance! LameXP już działa, przejdź do działającego procesu! @@ -3421,105 +3421,105 @@ Zamknij - - + + Build Build - + Unknown Nieznana - + Testing your internet connection, please wait... Testowanie połączenia internetowego, prosze czekać... - - + + It appears that the computer currently is offline! LameXP wykrył brak dostępu do internetu! - - + + Please make sure your computer is connected to the internet and try again. Upewnij się że komputer jest podłączony do internetu i spróbuj ponownie. - + Network connectivity test has failed! Test połączenia internetowego zakończony niepowodzeniem! - + Please make sure your internet connection is working properly and try again. Upewnij się że połączenie internetowe działa prawidłowo i spróbuj ponownie. - + Checking for new updates online, please wait... Sprawdzanie aktualizacji online, prosze czekać... - + Failed to fetch update information from server! Pobieranie informacji z serwera zakończone niepowodzeniem! - + Sorry, the update server might be busy at this time. Plase try again later. Serwer aktualizacji wydaje się nie odpowiadać w tej chwili. Prosze spróbować później. - + More information available at: Więcej informacji tutaj: - + A new version of LameXP is available! Dostępna nowa wersja LameXP! - + We highly recommend all users to install this update as soon as possible. Jest wysoce zalecane aby zainstalować tę aktualizację jak najszybciej. - + No new updates available at this time. Nie ma nowych aktualizacji w tej chwili. - + Your version of LameXP is still up-to-date. Please check for updates regularly! Posiadasz najnowszą wersję LameXP. Sprawdzaj aktualizacje regularnie! - + Your version appears to be newer than the latest release. Posiadasz nowszą wersję LameXP niż ostatnie wydanie. - + This usually indicates your are currently using a pre-release version of LameXP. To wskazuje na to, że posiadasz wersję alfa LameXP. - + Update is being downloaded, please be patient... Pobieranie aktualizacji w toku, prosze czekać... - + Update ready to install. Applicaion will quit... Aktualizacja gotowa do instalacji. Teraz program zostanie zamknięty... - + Update failed. Please try again or download manually! Aktualizacja zakończona niepowodzeniem. Prosze spróbować ponownie lub zainstalować ręcznie! diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts index df3de96a..19fb7624 100644 --- a/etc/Translation/LameXP_SV.ts +++ b/etc/Translation/LameXP_SV.ts @@ -2576,32 +2576,32 @@ Kan inte skriva till den specificerade mappen. Välj en annan destination! - + Overwrite Mode Överskrivningsläge - + Warning: This mode may overwrite existing files with no way to revert! Varning! Det här läget kan skriva över befintliga filer, utan möjlighet att återskapa! - + Continue Fortsätt - + Revert Återställ - + Already Running Körs redan - + LameXP is already running, please use the running instance! LameXP körs redan, använd den redan startade instansen! @@ -3404,105 +3404,105 @@ Stäng - - + + Build Build - + Unknown Okänd - + Testing your internet connection, please wait... Kontrollerar iInternetanslutningen, vänta... - - + + It appears that the computer currently is offline! Datorn verkar inte vara ansluten till Internet! - - + + Please make sure your computer is connected to the internet and try again. Tillse att datorn är ansluten till Internet och försök igen. - + Network connectivity test has failed! Anslutningskontrollen misslyckades! - + Please make sure your internet connection is working properly and try again. Tillse att Internetuppkopplingen fungerar korrekt och försök igen. - + Checking for new updates online, please wait... Söker nya uppdateringar, vänta... - + Failed to fetch update information from server! Kunde inte hämta uppdateringsinformation från servern! - + Sorry, the update server might be busy at this time. Plase try again later. Uppdateringsservern kan vara upptagen. Försök senare. - + More information available at: Mer information hittas på: - + A new version of LameXP is available! En ny version av LameXP finns tillgänglig! - + We highly recommend all users to install this update as soon as possible. Vi rekommenderar alla användare att installera denna uppdatering så snart som möjligt. - + No new updates available at this time. Det finns inga nya uppdateringar. - + Your version of LameXP is still up-to-date. Please check for updates regularly! Din version av LameXP är uppdaterad. Kontrollera regelbundet! - + Your version appears to be newer than the latest release. Din version verkar vara nyare än senaste 'Release'. - + This usually indicates your are currently using a pre-release version of LameXP. Det innebär normalt att du använder en beta-version av LameXP. - + Update is being downloaded, please be patient... Uppdatering laddas ner, vänta... - + Update ready to install. Applicaion will quit... Uppdatering klar att installeras. Programmet kommer att avslutas... - + Update failed. Please try again or download manually! Uppdateringen misslyckades. Försök igen, eller ladda ner manuellt! diff --git a/res/Images.qrc b/res/Images.qrc index d5afe656..de9857ab 100644 --- a/res/Images.qrc +++ b/res/Images.qrc @@ -7,7 +7,8 @@ images/CD.png images/Disque.png images/DropBox.png - images/HeaderIcon_CueImport.png + images/DropZone.png + images/HeaderIcon_CueImport.png images/HeaderIcon_LogFile.png images/HeaderIcon_MetaInfo.png images/Label.png diff --git a/res/images/DropZone.png b/res/images/DropZone.png new file mode 100644 index 0000000000000000000000000000000000000000..7ba0b942abfa3c217e3e493dd79da6da10866bef GIT binary patch literal 5942 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 Y1q^LFd0q}WL;wH)07*qoM6N<$f^R8yH2?qr literal 0 HcmV?d00001 diff --git a/src/Config.h b/src/Config.h index e42eff2c..343d7d12 100644 --- a/src/Config.h +++ b/src/Config.h @@ -34,8 +34,8 @@ #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 9 #define VER_LAMEXP_TYPE Alpha -#define VER_LAMEXP_PATCH 5 -#define VER_LAMEXP_BUILD 1437 +#define VER_LAMEXP_PATCH 6 +#define VER_LAMEXP_BUILD 1441 #define VER_LAMEXP_CONFG 1348 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index c77b86cc..2bec36ec 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -985,7 +985,7 @@ void MainWindow::changeEvent(QEvent *e) //Manually re-translate widgets that UIC doesn't handle m_outputFolderNoteBox->setText(tr("Initializing directory outline, please be patient...")); - m_dropNoteLabel->setText(QString("

» %1 «


").arg(tr("You can drop in audio files here!"))); + m_dropNoteLabel->setText(QString("


%1").arg(tr("You can drop in audio files here!"))); m_showDetailsContextAction->setText(tr("Show Details")); m_previewContextAction->setText(tr("Open File in External Application")); m_findFileContextAction->setText(tr("Browse File Location")); @@ -1113,9 +1113,9 @@ void MainWindow::resizeEvent(QResizeEvent *event) m_dropNoteLabel->setGeometry(port->geometry()); } - if(QWidget *port = ui->outputFolderView->viewport()) + if (QWidget *port = ui->outputFolderView->viewport()) { - m_outputFolderNoteBox->setGeometry(16, (port->height() - 64) / 2, port->width() - 32, 64); + m_outputFolderNoteBox->setGeometry(16, (port->height() - 64) / 2, port->width() - 32, 64); } } @@ -1772,6 +1772,10 @@ void MainWindow::styleActionActivated(QAction *action) const type_info &styleType = typeid(*qApp->style()); const bool bTransparent = ((typeid(QWindowsVistaStyle) == styleType) || (typeid(QWindowsXPStyle) == styleType)); MAKE_TRANSPARENT(ui->scrollArea, bTransparent); + + //Also force a re-size event + QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); + resizeEvent(NULL); } /*