[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso dialogs/MarkerDialog.cpp ...
|
From: |
Nicola Doebelin |
|
Subject: |
[Traverso-commit] traverso/src/traverso dialogs/MarkerDialog.cpp ... |
|
Date: |
Wed, 05 Dec 2007 21:20:05 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Nicola Doebelin <n_doebelin> 07/12/05 21:20:05
Modified files:
src/traverso/dialogs: MarkerDialog.cpp
src/traverso/dialogs/settings: Pages.cpp
src/traverso : Interface.cpp Interface.h
Log message:
Fixed problems with encoding in exported keymap, printed keymap, and
exported TOC. (German umlauts were not displayed correctly.)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/MarkerDialog.cpp?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.48&r2=1.49
Patches:
Index: dialogs/MarkerDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/MarkerDialog.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- dialogs/MarkerDialog.cpp 1 Dec 2007 16:34:23 -0000 1.21
+++ dialogs/MarkerDialog.cpp 5 Dec 2007 21:20:04 -0000 1.22
@@ -543,7 +543,7 @@
QTextStream out(&file);
- out << "<html>\n <head>\n </head>\n\n <body>\n";
+ out << "<html>\n <head>\n <meta http-equiv=\"content-type\"
content=\"text/html; charset=UTF-8\">\n </head>\n\n <body>\n";
out << " <h1>" << m_project->get_title() << "</h1>\n";
out << " <h2>" << m_project->get_description() << "</h2>\n";
Index: dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- dialogs/settings/Pages.cpp 3 Dec 2007 16:24:20 -0000 1.29
+++ dialogs/settings/Pages.cpp 5 Dec 2007 21:20:04 -0000 1.30
@@ -830,21 +830,14 @@
void KeyboardConfigPage::on_printButton_clicked()
{
- Interface::instance()->export_keymap();
- QFile file(QDir::homePath() + "/traversokeymap.html");
- if (!file.open(QIODevice::ReadOnly)) {
- QMessageBox::information( Interface::instance(), tr("Printing
KeyMap"),
- tr("The keymap export failed:\n\n
%1").arg(file.errorString()),
- QMessageBox::Ok);
- return;
- }
+ QString kmap;
+ Interface::instance()->get_keymap(kmap);
QPrinter printer(QPrinter::ScreenResolution);
QPrintDialog printDialog(&printer, Interface::instance());
if (printDialog.exec() == QDialog::Accepted) {
- QString string = file.readAll();
QTextEdit edit;
- edit.insertHtml(string);
+ edit.insertHtml(kmap);
edit.document()->print(&printer);
}
}
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- Interface.cpp 3 Dec 2007 19:45:13 -0000 1.115
+++ Interface.cpp 5 Dec 2007 21:20:05 -0000 1.116
@@ -692,6 +692,17 @@
return 0;
}
+ QString str;
+ (Command *) get_keymap(str);
+ out << str;
+
+ data.close();
+ return 0;
+}
+
+Command * Interface::get_keymap(QString &str)
+{
+
QMap<QString, QList<const QMetaObject*> > objects;
QList<const QMetaObject*> songlist; songlist <<
&Song::staticMetaObject; songlist << &SongView::staticMetaObject;
@@ -717,13 +728,13 @@
objects.insert("ProjectManager", pmlist);
- out << "<html><body><h1>Traverso keymap: " <<
config().get_property("CCE", "keymap", "default").toString() << "</h1>";
+ str = "<html><head><meta http-equiv=\"content-type\"
content=\"text/html; charset=UTF-8\"></head><body><h1>Traverso keymap: " +
config().get_property("CCE", "keymap", "default").toString() + "</h1>";
foreach(QList<const QMetaObject* > objectlist, objects.values()) {
QString name = objects.key(objectlist);
- out << "<h3>" << name << "</h3>";
- out << "<table><tr><td width=220>" << tr("<b>Description</b>")
<< "</td><td>" << tr("<b>Key Sequence</b>") << "</td></tr>";
+ str += "<h3>" + name + "</h3>";
+ str += "<table><tr><td width=220>" + tr("<b>Description</b>") +
"</td><td>" + tr("<b>Key Sequence</b>") + "</td></tr>";
QStringList result;
@@ -761,13 +772,11 @@
}
}
result.sort();
- out << result.join("");
- out << "</table></br></br>";
+ str += result.join("");
+ str += "</table></br></br>";
}
- out << "</body></html>";
-
- data.close();
+ str += "</body></html>";
return 0;
}
Index: Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- Interface.h 29 Nov 2007 19:52:18 -0000 1.48
+++ Interface.h 5 Dec 2007 21:20:05 -0000 1.49
@@ -172,6 +172,7 @@
Command* about_traverso();
Command* quick_start();
Command* export_keymap();
+ Command* get_keymap(QString &);
Command* show_export_widget();
Command* show_cd_writing_dialog();
Command* show_context_menu();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/traverso dialogs/MarkerDialog.cpp ...,
Nicola Doebelin <=