Mercurial > hg > easyhg
comparison mainwindow.cpp @ 228:b286f26561c9
* Restore a change that got lost in the merge. I think I need to review the external merge tool mechanism here
author | Chris Cannam |
---|---|
date | Thu, 06 Jan 2011 12:22:56 +0000 |
parents | 5d8a5ce96163 |
children | a1f4b5359051 |
comparison
equal
deleted
inserted
replaced
227:5d8a5ce96163 | 228:b286f26561c9 |
---|---|
153 | 153 |
154 void MainWindow::about() | 154 void MainWindow::about() |
155 { | 155 { |
156 QMessageBox::about(this, tr("About EasyMercurial"), | 156 QMessageBox::about(this, tr("About EasyMercurial"), |
157 tr("<qt><h2>About EasyMercurial</h2>" | 157 tr("<qt><h2>About EasyMercurial</h2>" |
158 #ifdef Q_OS_MAC | |
159 "<font size=-1>" | |
160 #endif | |
158 "<p>EasyMercurial is a simple user interface for the " | 161 "<p>EasyMercurial is a simple user interface for the " |
159 "Mercurial</a> version control system.</p>" | 162 "Mercurial</a> version control system.</p>" |
160 "<h4>Credits and Copyright</h4>" | 163 "<h4>Credits and Copyright</h4>" |
161 "<p>Development carried out by Chris Cannam for " | 164 "<p>Development carried out by Chris Cannam for " |
162 "SoundSoftware.ac.uk at the Centre for Digital Music, " | 165 "SoundSoftware.ac.uk at the Centre for Digital Music, " |
180 "<p>This program is free software; you can redistribute it and/or " | 183 "<p>This program is free software; you can redistribute it and/or " |
181 "modify it under the terms of the GNU General Public License as " | 184 "modify it under the terms of the GNU General Public License as " |
182 "published by the Free Software Foundation; either version 2 of the " | 185 "published by the Free Software Foundation; either version 2 of the " |
183 "License, or (at your option) any later version. See the file " | 186 "License, or (at your option) any later version. See the file " |
184 "COPYING included with this distribution for more information.</p>" | 187 "COPYING included with this distribution for more information.</p>" |
188 #ifdef Q_OS_MAC | |
189 "</font>" | |
190 #endif | |
185 )); | 191 )); |
186 } | 192 } |
187 | 193 |
188 void MainWindow::clearSelections() | 194 void MainWindow::clearSelections() |
189 { | 195 { |