Skip to content

Commit 0125c23

Browse files
vol0nvol0n
committed
initial
1 parent 5b25d20 commit 0125c23

File tree

21 files changed

+130
-144
lines changed

21 files changed

+130
-144
lines changed

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/ChangeVerboseModeAction.kt

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package org.utbot.cpp.clion.plugin.actions
2+
3+
import com.intellij.openapi.actionSystem.ActionPlaces
4+
import com.intellij.openapi.actionSystem.AnActionEvent
5+
import com.intellij.openapi.actionSystem.CommonDataKeys
6+
import com.intellij.openapi.actionSystem.ToggleAction
7+
import com.intellij.openapi.project.Project
8+
import org.utbot.cpp.clion.plugin.UTBot
9+
import org.utbot.cpp.clion.plugin.settings.settings
10+
11+
class ChangeVerboseModeAction : ToggleAction() {
12+
override fun isSelected(e: AnActionEvent): Boolean {
13+
updateActionText(e)
14+
return e.getRequiredData(CommonDataKeys.PROJECT).settings.storedSettings.verbose
15+
}
16+
17+
override fun isDumbAware(): Boolean = true
18+
19+
override fun update(e: AnActionEvent) {
20+
super.update(e)
21+
e.presentation.isEnabledAndVisible = (e.project != null)
22+
}
23+
24+
override fun setSelected(e: AnActionEvent, state: Boolean) {
25+
with(e.getRequiredData(CommonDataKeys.PROJECT).settings) {
26+
storedSettings.verbose = state
27+
fireUTBotSettingsChanged()
28+
}
29+
updateActionText(e)
30+
}
31+
32+
private fun updateActionText(e: AnActionEvent) {
33+
e.presentation.text = getActionText(e.getRequiredData(CommonDataKeys.PROJECT), e.place)
34+
}
35+
36+
companion object {
37+
private fun getActionText(project: Project, place: String? = null): String {
38+
val isVerboseEnabled = project.settings.storedSettings.verbose
39+
var newText = if (isVerboseEnabled) UTBot.message("actions.verbose.enabled")
40+
else UTBot.message("actions.verbose.disabled")
41+
if (place != null && ActionPlaces.isPopupPlace(place)) {
42+
newText = if (isVerboseEnabled)
43+
UTBot.message("actions.verbose.menu.enabled")
44+
else UTBot.message("actions.verbose.menu.disabled")
45+
}
46+
return newText
47+
}
48+
}
49+
}

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/RefreshTargetsAction.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.intellij.icons.AllIcons
44
import com.intellij.openapi.actionSystem.AnAction
55
import com.intellij.openapi.actionSystem.AnActionEvent
66
import com.intellij.openapi.components.service
7-
import org.utbot.cpp.clion.plugin.ui.targetsToolWindow.UTBotTargetsController
7+
import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTargetsController
88
import org.utbot.cpp.clion.plugin.utils.activeProject
99

1010
class RefreshTargetsAction: AnAction() {

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/GTestLogChannelImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.Flow
66
import org.utbot.cpp.clion.plugin.grpc.getDummyGrpcRequest
77
import org.utbot.cpp.clion.plugin.grpc.getLogChannelGrpcRequest
88
import org.utbot.cpp.clion.plugin.ui.services.OutputProvider
9-
import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
9+
import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.UTBotConsole
1010
import testsgen.Testgen
1111
import testsgen.TestsGenServiceGrpcKt
1212

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/LogChannelImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.intellij.openapi.project.Project
44
import kotlinx.coroutines.flow.Flow
55
import kotlinx.coroutines.flow.catch
66
import kotlinx.coroutines.flow.collect
7-
import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
7+
import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.UTBotConsole
88
import org.utbot.cpp.clion.plugin.utils.invokeOnEdt
99
import org.utbot.cpp.clion.plugin.utils.logger
1010
import testsgen.Testgen

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/ServerLogChannelImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.Flow
66
import org.utbot.cpp.clion.plugin.grpc.getDummyGrpcRequest
77
import org.utbot.cpp.clion.plugin.grpc.getLogChannelGrpcRequest
88
import org.utbot.cpp.clion.plugin.ui.services.OutputProvider
9-
import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
9+
import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.UTBotConsole
1010
import testsgen.Testgen
1111
import testsgen.TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub
1212

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotAllProjectSettings.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ package org.utbot.cpp.clion.plugin.settings
33
import com.intellij.openapi.components.Service
44
import com.intellij.openapi.components.service
55
import com.intellij.openapi.project.Project
6-
import com.jetbrains.cidr.cpp.execution.CMakeAppRunConfiguration
76
import org.utbot.cpp.clion.plugin.listeners.UTBotSettingsChangedListener
8-
import org.utbot.cpp.clion.plugin.ui.targetsToolWindow.UTBotTarget
7+
import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTarget
98
import org.utbot.cpp.clion.plugin.utils.convertToRemotePathIfNeeded
109
import org.utbot.cpp.clion.plugin.utils.isWindows
11-
import org.utbot.cpp.clion.plugin.utils.notifyWarning
1210
import org.utbot.cpp.clion.plugin.utils.path
1311
import java.io.File
1412
import java.nio.file.Path

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotProjectStoredSettings.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import com.intellij.openapi.components.State
66
import com.intellij.openapi.components.Storage
77
import com.intellij.openapi.components.service
88
import com.intellij.openapi.project.Project
9-
import org.utbot.cpp.clion.plugin.ui.targetsToolWindow.UTBotTarget
10-
import org.utbot.cpp.clion.plugin.ui.targetsToolWindow.UTBotTargetsController
9+
import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTarget
10+
import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTargetsController
1111
import org.utbot.cpp.clion.plugin.utils.path
1212
import java.nio.file.Paths
1313

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/services/OutputProvider.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import com.intellij.openapi.util.Disposer
99
import com.intellij.util.ui.JBUI
1010
import com.intellij.util.ui.components.BorderLayoutPanel
1111
import org.utbot.cpp.clion.plugin.client.logger.LogLevel
12-
import org.utbot.cpp.clion.plugin.ui.userLog.OutputType
13-
import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
1412
import org.utbot.cpp.clion.plugin.utils.logger
1513
import java.awt.BorderLayout
1614
import java.awt.Component
1715
import java.awt.GridLayout
1816
import java.awt.event.ItemEvent
1917
import javax.swing.JPanel
18+
import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.OutputType
19+
import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.UTBotConsole
2020

2121
@Service
2222
class OutputProvider(val project: Project) : Disposable {
@@ -65,4 +65,4 @@ class OutputProvider(val project: Project) : Disposable {
6565
}
6666
}
6767
}
68-
}
68+
}

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/StatusBarConnectionStatus.kt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ package org.utbot.cpp.clion.plugin.ui.statusBar
22

33
import com.intellij.ide.DataManager
44
import com.intellij.openapi.actionSystem.ActionPlaces
5+
import com.intellij.openapi.actionSystem.AnActionEvent
56
import com.intellij.openapi.actionSystem.DataContext
67
import com.intellij.openapi.actionSystem.DefaultActionGroup
8+
import com.intellij.openapi.options.ShowSettingsUtil
9+
import com.intellij.openapi.project.DumbAwareAction
710
import com.intellij.openapi.project.Project
811
import com.intellij.openapi.ui.popup.JBPopupFactory
912
import com.intellij.openapi.ui.popup.ListPopup
@@ -12,12 +15,15 @@ import com.intellij.openapi.wm.StatusBarWidget
1215
import com.intellij.openapi.wm.StatusBarWidgetFactory
1316
import com.intellij.ui.awt.RelativePoint
1417
import com.intellij.util.Consumer
18+
import org.utbot.cpp.clion.plugin.UTBot
19+
import org.utbot.cpp.clion.plugin.actions.ChangeVerboseModeAction
1520
import org.utbot.cpp.clion.plugin.actions.ReconnectAction
1621
import org.utbot.cpp.clion.plugin.actions.configure.ConfigureProjectAction
1722
import org.utbot.cpp.clion.plugin.actions.configure.ReconfigureProjectAction
1823
import org.utbot.cpp.clion.plugin.actions.ShowWizardAction
1924
import org.utbot.cpp.clion.plugin.listeners.ConnectionStatus
2025
import org.utbot.cpp.clion.plugin.listeners.UTBotEventsListener
26+
import org.utbot.cpp.clion.plugin.settings.UTBotConfigurable
2127
import org.utbot.cpp.clion.plugin.utils.projectLifetimeDisposable
2228
import java.awt.Component
2329
import java.awt.Point
@@ -100,6 +106,16 @@ object StatusBarActionsPopup {
100106
ActionPlaces.POPUP
101107
)
102108
}
109+
private object ShortcutSettingsAction : DumbAwareAction(UTBot.message("actions.settings.text")) {
110+
override fun actionPerformed(e: AnActionEvent) {
111+
ShowSettingsUtil.getInstance().showSettingsDialog(e.project, UTBotConfigurable::class.java)
112+
}
113+
114+
override fun update(e: AnActionEvent) {
115+
super.update(e)
116+
e.presentation.isEnabledAndVisible = e.project != null
117+
}
118+
}
103119

104120
private fun getActions(): DefaultActionGroup {
105121
val actionGroup = DefaultActionGroup()
@@ -109,9 +125,13 @@ object StatusBarActionsPopup {
109125
actionGroup.addSeparator()
110126
actionGroup.add(ConfigureProjectAction())
111127
actionGroup.addSeparator()
128+
actionGroup.add(ShortcutSettingsAction)
129+
actionGroup.addSeparator()
112130
actionGroup.add(ReconnectAction())
113131
actionGroup.addSeparator()
114132
actionGroup.addAction(ReconfigureProjectAction())
133+
actionGroup.addSeparator()
134+
actionGroup.add(ChangeVerboseModeAction())
115135

116136
return actionGroup
117137
}

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/statusBar/UTBotStatusBarVerboseWidget.kt

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)