Merge branch '1.0.0' of git@scm.dev.nokia.troll.no:creator/mainline into 1.0.0

share/share.pri

@@ -9,11 +9,9 @@ macx {
     SCHEMES.files = $$PWD/qtcreator/schemes
     GDBDEBUGGER.path = Contents/Resources
     GDBDEBUGGER.files = $$PWD/qtcreator/gdbmacros
-    LICENSE.path = Contents/Resources
-    LICENSE.files = $$PWD/qtcreator/license.txt
     RUNINTERMINAL.path = Contents/Resources
     RUNINTERMINAL.files = $$PWD/qtcreator/runInTerminal.command
-    QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER LICENSE RUNINTERMINAL
+    QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER RUNINTERMINAL
     QMAKE_INFO_PLIST = $$PWD/qtcreator/Info.plist
 }
 
@@ -43,9 +41,6 @@ win32|linux-* {
 }
 
 linux-* {
-    licenses.files          += $$PWD/qtcreator/license.txt
-    licenses.path            = /share/qtcreator
-
     keymaps.files           += $$PWD/qtcreator/schemes/MS_Visual_C++.kms
     keymaps.files           += $$PWD/qtcreator/schemes/Xcode.kms
     keymaps.path             = /share/qtcreator/schemes
@@ -71,7 +66,6 @@ linux-* {
     projecttemplates.path    = /share/qtcreator/templates/qt4project
 
     INSTALLS += \
-       licenses \
        keymaps \
        gdbsupport \
        designertemplates \

src/libs/utils/projectintropage.ui

@@ -70,7 +70,7 @@
         <item row="1" column="0">
          <widget class="QLabel" name="pathLabel">
           <property name="text">
-           <string>Path:</string>
+           <string>Create in:</string>
           </property>
          </widget>
         </item>

src/plugins/coreplugin/html/qt.css

@@ -231,6 +231,7 @@ Layout TOP - Logo und Welcome Text
 	
 	float:left;
 	width:210px;
+	padding-top:70px;
 		
 	}
 

src/plugins/coreplugin/versiondialog.cpp

@@ -98,43 +98,9 @@ VersionDialog::VersionDialog(QWidget *parent)
     buttonBox->addButton(closeButton, QDialogButtonBox::ButtonRole(QDialogButtonBox::RejectRole | QDialogButtonBox::AcceptRole));
     connect(buttonBox , SIGNAL(rejected()), this, SLOT(reject()));
 
-    buttonBox->addButton(tr("Show License"), QDialogButtonBox::HelpRole);
-    connect(buttonBox , SIGNAL(helpRequested()), this, SLOT(popupLicense()));
-
     QLabel *logoLabel = new QLabel;
     logoLabel->setPixmap(QPixmap(QLatin1String(":/core/images/qtcreator_logo_128.png")));
     layout->addWidget(logoLabel , 0, 0, 1, 1);
     layout->addWidget(copyRightLabel, 0, 1, 4, 4);
     layout->addWidget(buttonBox, 4, 0, 1, 5);
 }
-
-void VersionDialog::popupLicense()
-{
-    QDialog *dialog = new QDialog(this);
-    dialog->setWindowTitle("License");
-    QVBoxLayout *layout = new QVBoxLayout(dialog);
-    QTextBrowser *licenseBrowser = new QTextBrowser(dialog);
-    layout->addWidget(licenseBrowser);
-
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
-    connect(buttonBox , SIGNAL(rejected()), dialog, SLOT(reject()));
-    layout->addWidget(buttonBox);
-
-    // Read file into string
-    ICore *core = ICore::instance();
-    QTC_ASSERT(core, return);
-    QString fileName = core->resourcePath() + "/license.txt";
-    QFile file(fileName);
-
-    QString licenseText;
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
-        licenseText = "File '" + fileName + "' could not be read.";
-    else
-        licenseText = file.readAll();
-
-    licenseBrowser->setPlainText(licenseText);
-
-    dialog->setMinimumSize(QSize(550, 690));
-    dialog->exec();
-    delete dialog;
-}

src/plugins/coreplugin/versiondialog.h

@@ -44,8 +44,6 @@ class VersionDialog : public QDialog
     Q_OBJECT
 public:
     explicit VersionDialog(QWidget *parent);
-private slots:
-    void popupLicense();
 };
 
 } // namespace Internal

src/plugins/find/findtoolbar.cpp

@@ -79,6 +79,8 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     addWidget(m_widget);
     setFocusProxy(m_ui.findEdit);
     setProperty("topBorder", true);
+    m_ui.findEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
+    m_ui.replaceEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
 
     connect(m_ui.findEdit, SIGNAL(editingFinished()), this, SLOT(invokeResetIncrementalSearch()));
 

src/plugins/projectexplorer/projectexplorer.cpp

@@ -441,7 +441,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     // session menu
     Core::ActionContainer *msession = am->createMenu(Constants::M_SESSION);
-    msession->menu()->setTitle("&Session");
+    msession->menu()->setTitle(tr("Session"));
     mfile->addMenu(msession, Core::Constants::G_FILE_PROJECT);
     m_sessionMenu = msession->menu();
     connect(mfile->menu(), SIGNAL(aboutToShow()),

src/plugins/projectexplorer/projectfilewizardextension.cpp

@@ -152,7 +152,7 @@ QList<QWizardPage *> ProjectFileWizardExtension::extensionPages(const Core::IWiz
         const int count = m_context->projects.size();
         for (int i = 0; i < count; i++) {
             ProjectNode *pn = m_context->projects.at(i);
-            projectNames.push_back(pn->name());
+            projectNames.push_back(QFileInfo(pn->path()).fileName());
             if (current == pn)
                 currentIndex = i;
         }

src/plugins/quickopen/quickopentoolwindow.cpp

@@ -281,6 +281,7 @@ QuickOpenToolWindow::QuickOpenToolWindow(QuickOpenPlugin *qop) :
     m_fileLineEdit->setUseLayoutDirection(true);
     m_fileLineEdit->setHintText(tr("Type to locate"));
     m_fileLineEdit->setFocusPolicy(Qt::ClickFocus);
+    m_fileLineEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
 
     m_fileLineEdit->installEventFilter(this);
     this->installEventFilter(this);