• R/O
  • HTTP
  • SSH
  • HTTPS

qt-creator-jp: コミット

Qt Creator 日本語化プロジェクトのgitリポジトリです。
git://labs.trolltech.com/creator をcloneして
ひとまず1.0.0-jpブランチを作成して作業していきます。


コミットメタ情報

リビジョン84f550ff90d62b8cbc6e00ed4ad8592899514d7d (tree)
日時2012-04-21 01:39:20
作者axasia <axasia@gmai...>
コミッターaxasia

ログメッセージ

Merge branch '2.5' of git://gitorious.org/qt-creator/qt-creator into 2.5-jp

変更サマリ

差分

Binary files a/doc/images/qml-observer-buttons.png and /dev/null differ
Binary files a/doc/images/qml-profiler-javascript.png and b/doc/images/qml-profiler-javascript.png differ
Binary files a/doc/images/qtcreator-analyze-menu.png and b/doc/images/qtcreator-analyze-menu.png differ
Binary files a/doc/images/qtcreator-analyze-start-button.png and b/doc/images/qtcreator-analyze-start-button.png differ
Binary files a/doc/images/qtcreator-analyzer-bindings.png and b/doc/images/qtcreator-analyzer-bindings.png differ
Binary files a/doc/images/qtcreator-analyzer-button.png and b/doc/images/qtcreator-analyzer-button.png differ
Binary files a/doc/images/qtcreator-analyzer-stop-button.png and /dev/null differ
Binary files a/doc/images/qtcreator-qml-performance-monitor-toolbar.png and /dev/null differ
Binary files a/doc/images/qtcreator-qml-performance-monitor.png and b/doc/images/qtcreator-qml-performance-monitor.png differ
--- a/doc/src/analyze/qtquick-profiler.qdoc
+++ b/doc/src/analyze/qtquick-profiler.qdoc
@@ -50,21 +50,24 @@
5050 \o Select \gui {Analyze > QML Profiler} to profile the current
5151 application.
5252
53- \o Select the \gui Start button (1) to start the application from the
53+ \o Select the
54+ \inlineimage qtcreator-analyze-start-button.png
55+ (\gui Start) button to start the application from the
5456 QML Profiler.
5557
56- \image qtcreator-qml-performance-monitor-toolbar.png "QML Profiler toolbar"
57-
5858 \note If data collection does not start automatically, select the
59- \gui {Enable Profiling} button (3).
59+ \inlineimage qtcreator-analyzer-button.png
60+ (\gui {Enable Profiling}) button.
6061
6162 \endlist
6263
6364 When you start analyzing an application, the application is launched, and
6465 the QML Profiler immediately begins to collect data. This is indicated by
65- the time running in the \gui Elapsed field (4).
66+ the time running in the \gui Elapsed field.
6667
67- Data is collected until you select the \gui Stop button (2). Data collection
68+ Data is collected until you select the
69+ \inlineimage qtcreator-debug-button-stop.png
70+ (\gui Stop) button. Data collection
6871 takes time, and therefore, there might be a delay
6972 before the data is displayed.
7073
@@ -73,7 +76,7 @@
7376 The application continues to run for some seconds, after which it is stopped
7477 automatically. If you exit the application, the data is not sent.
7578
76- Select the \gui {Disable Profiling} button (3) to disable the automatic
79+ Select the \gui {Disable Profiling} button to disable the automatic
7780 start of the data collection when an
7881 application is launched. Data collection starts when you select the button
7982 again.
--- a/src/plugins/cppeditor/cpptypehierarchy.cpp
+++ b/src/plugins/cppeditor/cpptypehierarchy.cpp
@@ -95,8 +95,8 @@ namespace Internal {
9595 class CppClassLabel : public QLabel
9696 {
9797 public:
98- CppClassLabel(CPPEditorWidget *editor, QWidget *parent)
99- : QLabel(parent), m_editor(editor)
98+ CppClassLabel(QWidget *parent)
99+ : QLabel(parent)
100100 {}
101101
102102 void setup(CppClass *cppClass)
@@ -108,10 +108,15 @@ public:
108108 private:
109109 void mousePressEvent(QMouseEvent *)
110110 {
111- m_editor->openLink(m_link);
111+ if (m_link.fileName.isEmpty())
112+ return;
113+
114+ TextEditor::BaseTextEditorWidget::openEditorAt(m_link.fileName,
115+ m_link.line,
116+ m_link.column,
117+ Constants::CPPEDITOR_ID);
112118 }
113119
114- CPPEditorWidget *m_editor;
115120 CPPEditorWidget::Link m_link;
116121 };
117122
@@ -133,7 +138,7 @@ CppTypeHierarchyWidget::CppTypeHierarchyWidget(Core::IEditor *editor) :
133138 if (CPPEditor *cppEditor = qobject_cast<CPPEditor *>(editor)) {
134139 m_cppEditor = static_cast<CPPEditorWidget *>(cppEditor->widget());
135140
136- m_inspectedClass = new CppClassLabel(m_cppEditor, this);
141+ m_inspectedClass = new CppClassLabel(this);
137142 m_inspectedClass->setMargin(5);
138143 layout->addWidget(m_inspectedClass);
139144 m_model = new QStandardItemModel(this);
旧リポジトリブラウザで表示