mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Undoing the last Qtr_ hack

Browse source 
The Qtr_ hack isn't needed as in commit 720fc15b2dcd ("Introduce
QApplication") had already made sure that we are using gettext.

I didn't revert the two commits as I wanted to keep the added header
comments and fix the tooling in the Makefile as well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-04-14 06:44:29 -07:00
parent fc0e307f00
commit d8e11439ad
7 changed files with 21 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/mainwindow.cpp
View file

@ -3,8 +3,6 @@
*
* classes for the main UI window in Subsurface
*/
#include "common.h"
#include "mainwindow.h"
#include "ui_mainwindow.h"
@ -60,7 +58,7 @@ void MainWindow::on_actionNew_triggered()
void MainWindow::on_actionOpen_triggered()
{
QString filename = QFileDialog::getOpenFileName(this, Qtr_("Open File"), QDir::homePath(), filter());
QString filename = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::homePath(), filter());
if (filename.isEmpty()){
return;
}
@ -290,10 +288,10 @@ QString MainWindow::filter()
bool MainWindow::askSaveChanges()
{
QString message = ! existing_filename ? Qtr_("You have unsaved changes\nWould you like to save those before closing the datafile?")
: Qtr_("You have unsaved changes to file: %1 \nWould you like to save those before closing the datafile?").arg(existing_filename);
QString message = ! existing_filename ? tr("You have unsaved changes\nWould you like to save those before closing the datafile?")
: tr("You have unsaved changes to file: %1 \nWould you like to save those before closing the datafile?").arg(existing_filename);
if (QMessageBox::question(this, Qtr_("Save Changes?"), message) == QMessageBox::Ok){
if (QMessageBox::question(this, tr("Save Changes?"), message) == QMessageBox::Ok){
// WARNING: Port.
// file_save(NULL,NULL);
return true;