From c077ef28d8e35aefef375de3f253428bd264c5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Mon, 12 Jan 2009 17:57:56 +0100
Subject: [PATCH] Make project dependencies dialog accessible again

Not entirely sure about the location of the menu entry. Also, the dialog
is in dire need of a redesign.
---
 .../projectexplorer/dependenciesdialog.ui     | 56 +++++++------------
 .../projectexplorer/projectexplorer.cpp       |  9 ++-
 2 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/src/plugins/projectexplorer/dependenciesdialog.ui b/src/plugins/projectexplorer/dependenciesdialog.ui
index 25ffdff8948..31a70dae983 100644
--- a/src/plugins/projectexplorer/dependenciesdialog.ui
+++ b/src/plugins/projectexplorer/dependenciesdialog.ui
@@ -1,59 +1,45 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ProjectExplorer::Internal::DependenciesDialog</class>
- <widget class="QDialog" name="ProjectExplorer::Internal::DependenciesDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="ProjectExplorer::Internal::DependenciesDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>618</width>
-    <height>660</height>
+    <width>492</width>
+    <height>435</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Project Dependencies</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
+   <property name="margin">
     <number>9</number>
    </property>
    <item>
-    <widget class="QTableView" name="dependencyTable" >
-     <property name="minimumSize" >
-      <size>
-       <width>600</width>
-       <height>600</height>
-      </size>
-     </property>
-     <property name="selectionMode" >
+    <widget class="QTableView" name="dependencyTable">
+     <property name="selectionMode">
       <enum>QAbstractItemView::SingleSelection</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="Line" name="line" >
-     <property name="orientation" >
+    <widget class="Line" name="line">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -68,11 +54,11 @@
    <receiver>ProjectExplorer::Internal::DependenciesDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>142</x>
      <y>285</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>142</x>
      <y>155</y>
     </hint>
@@ -84,11 +70,11 @@
    <receiver>ProjectExplorer::Internal::DependenciesDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>142</x>
      <y>285</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>142</x>
      <y>155</y>
     </hint>
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index e4721457af4..3548023d641 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -484,6 +484,10 @@ bool ProjectExplorerPlugin::initialize(const QStringList & /*arguments*/, QStrin
     mbuild->addAction(cmd, Constants::G_BUILD_SESSION);
     msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD);
 
+    // dependencies action
+    m_dependenciesAction = new QAction(tr("Edit Dependencies..."), this);
+    cmd = am->registerAction(m_dependenciesAction, Constants::DEPENDENCIES, globalcontext);
+    mbuild->addAction(cmd, Constants::G_BUILD_SESSION);
 
     // build action
     m_buildAction = new QAction(tr("Build Project"), this);
@@ -555,11 +559,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList & /*arguments*/, QStrin
     mdebug->addAction(cmd, Core::Constants::G_DEFAULT_ONE);
     modeManager->addAction(cmd, Constants::P_ACTION_DEBUG, m_runConfigurationMenu);
 
-    // dependencies action
-    m_dependenciesAction = new QAction(tr("Edit Dependencies..."), this);
-    cmd = am->registerAction(m_dependenciesAction, Constants::DEPENDENCIES, pecontext);
-    msessionContextMenu->addAction(cmd, Constants::G_SESSION_CONFIG);
-
     // add new file action
     m_addNewFileAction = new QAction(tr("Add New..."), this);
     cmd = am->registerAction(m_addNewFileAction, ProjectExplorer::Constants::ADDNEWFILE,