git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index 528a7acf1863772cf7f59c1be7e5c765c487b6fe..c3e885882d1a3497fd09c7e418103b686ae92310 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -26,16 +26,16 @@ namespace Maestro {
         /// </summary>\r
         private void InitializeComponent() {\r
             this.components = new System.ComponentModel.Container();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.groupSource = new System.Windows.Forms.GroupBox();\r
             this.dataGridSource = new System.Windows.Forms.DataGridView();\r
             this.bindingSource = new System.Windows.Forms.BindingSource(this.components);\r
@@ -133,31 +133,31 @@ namespace Maestro {
             this.dataGridSource.BackgroundColor = System.Drawing.Color.White;\r
             this.dataGridSource.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dataGridSource.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dataGridSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;\r
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dataGridSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
             this.dataGridSource.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dataGridSource.DataSource = this.bindingSource;\r
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dataGridSource.DefaultCellStyle = dataGridViewCellStyle12;\r
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dataGridSource.DefaultCellStyle = dataGridViewCellStyle2;\r
             this.dataGridSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dataGridSource.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dataGridSource.Location = new System.Drawing.Point(10, 43);\r
             this.dataGridSource.Name = "dataGridSource";\r
             this.dataGridSource.RowHeadersVisible = false;\r
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dataGridSource.RowsDefaultCellStyle = dataGridViewCellStyle13;\r
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dataGridSource.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
             this.dataGridSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dataGridSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dataGridSource.Size = new System.Drawing.Size(394, 304);\r
@@ -169,6 +169,7 @@ namespace Maestro {
             this.dataGridSource.CellMouseLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridSource_CellMouseLeave);\r
             this.dataGridSource.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dataGridSource_CellPainting);\r
             this.dataGridSource.SelectionChanged += new System.EventHandler(this.sourceGridView_SelectionChanged);\r
+            this.dataGridSource.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridSource_KeyDown);\r
             // \r
             // txtSorceFilter\r
             // \r
@@ -533,14 +534,14 @@ namespace Maestro {
             this.dataGridJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
             this.dataGridJobs.BackgroundColor = System.Drawing.Color.White;\r
             this.dataGridJobs.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dataGridJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;\r
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dataGridJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;\r
             this.dataGridJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dataGridJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.columnID,\r
@@ -551,29 +552,29 @@ namespace Maestro {
             this.columnProgress,\r
             this.columnStatus});\r
             this.dataGridJobs.DataSource = this.bindingSourceJobs;\r
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle18.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dataGridJobs.DefaultCellStyle = dataGridViewCellStyle18;\r
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dataGridJobs.DefaultCellStyle = dataGridViewCellStyle8;\r
             this.dataGridJobs.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dataGridJobs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dataGridJobs.Location = new System.Drawing.Point(10, 23);\r
             this.dataGridJobs.Name = "dataGridJobs";\r
-            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dataGridJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle19;\r
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dataGridJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;\r
             this.dataGridJobs.RowHeadersVisible = false;\r
-            dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dataGridJobs.RowsDefaultCellStyle = dataGridViewCellStyle20;\r
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dataGridJobs.RowsDefaultCellStyle = dataGridViewCellStyle10;\r
             this.dataGridJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dataGridJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dataGridJobs.Size = new System.Drawing.Size(1002, 105);\r
@@ -584,8 +585,8 @@ namespace Maestro {
             // \r
             this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnID.DataPropertyName = "ID";\r
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnID.DefaultCellStyle = dataGridViewCellStyle15;\r
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.columnID.DefaultCellStyle = dataGridViewCellStyle5;\r
             this.columnID.Frozen = true;\r
             this.columnID.HeaderText = "ID";\r
             this.columnID.Name = "columnID";\r
@@ -627,10 +628,10 @@ namespace Maestro {
             // \r
             this.columnProgress.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;\r
             this.columnProgress.DataPropertyName = "Progress";\r
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;\r
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle16.NullValue = null;\r
-            this.columnProgress.DefaultCellStyle = dataGridViewCellStyle16;\r
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;\r
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle6.NullValue = null;\r
+            this.columnProgress.DefaultCellStyle = dataGridViewCellStyle6;\r
             this.columnProgress.HeaderText = "Progress";\r
             this.columnProgress.Name = "columnProgress";\r
             this.columnProgress.Resizable = System.Windows.Forms.DataGridViewTriState.True;\r
@@ -641,8 +642,8 @@ namespace Maestro {
             // \r
             this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnStatus.DataPropertyName = "Status";\r
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnStatus.DefaultCellStyle = dataGridViewCellStyle17;\r
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.columnStatus.DefaultCellStyle = dataGridViewCellStyle7;\r
             this.columnStatus.HeaderText = "Status";\r
             this.columnStatus.Name = "columnStatus";\r
             this.columnStatus.Width = 66;\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index ec86e3a42509d237ac08ec5690221b6bd98f88f3..d9928defc7c8fe0f0ece7c6de95a44323bfe1d4b 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -96,13 +96,12 @@ namespace Maestro {
         private void sourceGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) {\r
             var selectedrows = dataGridSource.SelectedRows;\r
             var selectedItems = bindingSource.Current;\r
-            if (selectedrows == null) {\r
+            if (selectedrows == null)\r
                 return;\r
-            }\r
-            if (e.ColumnIndex == 0) {\r
-                SetSourceFromCheckBoxAction(selectedrows);\r
-                return;\r
-            }\r
+            //if (e.ColumnIndex == 0) {\r
+            //    SetSourceFromCheckBoxAction(selectedrows);\r
+            //    return;\r
+            //}\r
             if (e.ColumnIndex != 3)\r
                 return;\r
             FileSourceItem fileSourceItem = selectedItems as FileSourceItem;\r
@@ -270,5 +269,12 @@ namespace Maestro {
             SetTextSelectedSourceTextFromCheckBoxes();\r
             SetMetadataButtonEnabled(selectedRows.Count > 0);\r
         }\r
+\r
+        private void dataGridSource_KeyDown(object sender, KeyEventArgs e) {\r
+            if (e.KeyCode == Keys.Space) {\r
+                var selectedRows = dataGridSource.SelectedRows;\r
+                SetSourceFromCheckBoxAction(selectedRows);\r
+            }\r
+        }\r
     }\r
 }\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index 2bf54e9a9a67b954121d7a83887822b75bbb3db2..8ccfa29f105989e637428636db1f537d24c4fd5d 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -245,5 +245,7 @@ namespace Maestro {
             SearchResult searchResult = new SearchResult(result, trafficMetadataSelected);\r
             searchResult.ShowDialog();\r
         }\r
+\r
+        \r
     }\r
 }\r